Skip to content

Commit de59622

Browse files
authored
Merge pull request #5 from alibuild/alibot-cleanup-8728
[PWGJE] Please consider the following formatting changes to AliceO2Group#8728
2 parents b8d3169 + 0525e27 commit de59622

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

PWGJE/DataModel/GammaJetAnalysisTree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ DECLARE_SOA_COLUMN(LeadingTrackPt, leadingtrackpt, float);
7474
DECLARE_SOA_COLUMN(PerpConeRho, perpconerho, float);
7575
DECLARE_SOA_COLUMN(NConstituents, nConstituents, ushort);
7676
} // namespace gjchjet
77-
DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt,gjchjet::PerpConeRho,gjchjet::NConstituents)
77+
DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt, gjchjet::PerpConeRho, gjchjet::NConstituents)
7878
} // namespace o2::aod
7979

8080
#endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_

PWGJE/TableProducer/emcalCorrectionTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ struct EmcalCorrectionTask {
568568
mClusterLabels.clear();
569569
mClusterFactories.reset();
570570
// in preparation for future O2 changes
571-
//mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
571+
// mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
572572
if (cellLabels) {
573573
mClusterFactories.setContainer(*emcalClusters, cellsBC, *emcalClustersInputIndices, cellLabels);
574574
} else {

PWGJE/Tasks/gammaJetTreeProducer.cxx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ struct GammaJetTreeProducer {
107107
const o2Axis energyAxis{100, 0, 100, "E (GeV)"};
108108
const o2Axis m02Axis{100, 0, 3, "m02"};
109109
const o2Axis etaAxis{100, -1, 1, "#eta"};
110-
const o2Axis phiAxis{100, 0 , 2*TMath::Pi(), "#phi"};
110+
const o2Axis phiAxis{100, 0, 2 * TMath::Pi(), "#phi"};
111111
const o2Axis occupancyAxis{300, 0, 30000, "occupancy"};
112112
mHistograms.add("clusterE", "Energy of cluster", o2HistType::kTH1F, {energyAxis});
113113
mHistograms.add("trackPt", "pT of track", o2HistType::kTH1F, {ptAxis});
@@ -264,7 +264,8 @@ struct GammaJetTreeProducer {
264264
{
265265
// event selection
266266
int32_t storedColIndex = getStoredColIndex(collision);
267-
if (storedColIndex == -1) return;
267+
if (storedColIndex == -1)
268+
return;
268269

269270
// eventsTable(collision.multiplicity(), collision.centrality(), collision.rho(), collision.eventSel(), collision.trackOccupancyInTimeRange(), collision.alias_raw());
270271
// collisionMapping[collision.globalIndex()] = eventsTable.lastIndex();
@@ -296,7 +297,7 @@ struct GammaJetTreeProducer {
296297
auto emcTracksPerTrack = emctracks.sliceBy(EMCTrackPerTrack, track.globalIndex());
297298
auto emcTrack = emcTracksPerTrack.iteratorAt(0);
298299
// find closest track that still has E/p < trackMatchingEoverP
299-
if (cluster.energy()/track.p() > trackMatchingEoverP) {
300+
if (cluster.energy() / track.p() > trackMatchingEoverP) {
300301
continue;
301302
} else {
302303
dEta = cluster.eta() - emcTrack.etaEmcal();
@@ -321,7 +322,8 @@ struct GammaJetTreeProducer {
321322
{
322323
// event selection
323324
int32_t storedColIndex = getStoredColIndex(collision);
324-
if (storedColIndex == -1) return;
325+
if (storedColIndex == -1)
326+
return;
325327
float leadingTrackPt = 0;
326328
ushort nconst = 0;
327329
// loop over charged jets

0 commit comments

Comments
 (0)