Skip to content

Commit 98c201d

Browse files
tutripattutripat
authored
Merge pull request #22 from alibuild/alibot-cleanup-17939
Please consider the following formatting changes to #17939
2 parents 06990c8 + 96046e4 commit 98c201d

1 file changed

Lines changed: 42 additions & 45 deletions

File tree

‎PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx‎

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ struct PseudorapidityDensityMFT {
295295
static constexpr int NoCompatibleCollisions = 0;
296296
static constexpr int SingleCompatibleCollision = 1;
297297

298-
299298
static constexpr int ChargeUnitTimesThree = 3;
300299

301300
void initMagField(FullBCs::iterator const& bc)
@@ -393,7 +392,7 @@ struct PseudorapidityDensityMFT {
393392
Configurable<bool> useTriggerTVX{"useTriggerTVX", true, "Require kIsTriggerTVX in processGenReco"};
394393
Configurable<bool> useNoTimeFrameBorderCut{"useNoTimeFrameBorderCut", true, "Require kNoTimeFrameBorder in processGenReco"};
395394
Configurable<bool> useNoITSROFrameBorderCut{"useNoITSROFrameBorderCut", true, "Require kNoITSROFrameBorder in processGenReco"};
396-
AxisSpec multAxisRecoMFT = {multBinning, "N_{ch}^{reco,MFT}"};
395+
AxisSpec multAxisRecoMFT = {multBinning, "N_{ch}^{reco,MFT}"};
397396
AxisSpec multAxisGenMFT = {multBinning, "N_{ch}^{gen,MFT}"};
398397
HistogramRegistry registry{
399398
"registry",
@@ -1409,10 +1408,10 @@ struct PseudorapidityDensityMFT {
14091408

14101409
std::vector<typename std::decay_t<decltype(collisions)>::iterator> cols;
14111410
for (const auto& bc : bcs) {
1412-
if (!useEvSel ||
1413-
(bc.selection_bit(aod::evsel::kIsBBT0A) &&
1414-
bc.selection_bit(aod::evsel::kIsBBT0C))) {
1415-
registry.fill(HIST("EventSelection"), static_cast<int>(EventSelectionBin::GoodBCs));
1411+
if (!useEvSel ||
1412+
(bc.selection_bit(aod::evsel::kIsBBT0A) &&
1413+
bc.selection_bit(aod::evsel::kIsBBT0C))) {
1414+
registry.fill(HIST("EventSelection"), static_cast<int>(EventSelectionBin::GoodBCs));
14161415
cols.clear();
14171416
for (const auto& collision : collisions) {
14181417
if (collision.has_foundBC()) {
@@ -1535,7 +1534,7 @@ struct PseudorapidityDensityMFT {
15351534
((phi > ((o2::constants::math::PIHalf - 0.1) * o2::constants::math::PI) - cfgPhiCut) &&
15361535
(phi < ((o2::constants::math::PIHalf - 0.1) * o2::constants::math::PI) + cfgPhiCut))) {
15371536
continue;
1538-
}
1537+
}
15391538
}
15401539

15411540
registry.fill(HIST("TracksEtaZvtx"), track.eta(), z);
@@ -1882,7 +1881,7 @@ struct PseudorapidityDensityMFT {
18821881
((phi > ((o2::constants::math::PIHalf - 0.1) * o2::constants::math::PI) - cfgPhiCut) &&
18831882
(phi < ((o2::constants::math::PIHalf - 0.1) * o2::constants::math::PI) + cfgPhiCut))) {
18841883
continue;
1885-
}
1884+
}
18861885
}
18871886

18881887
registry.fill(HIST("Tracks/Centrality/EtaZvtx"), track.eta(), z, c);
@@ -2022,9 +2021,9 @@ struct PseudorapidityDensityMFT {
20222021

20232022
if (usePhiCut) {
20242023
if ((phi <= PhiVetoLow) ||
2025-
((phi >= PhiVetoPiMin) && (phi <= PhiVetoPiMax)) ||
2026-
(phi >= PhiVetoHigh)) {
2027-
continue;
2024+
((phi >= PhiVetoPiMin) && (phi <= PhiVetoPiMax)) ||
2025+
(phi >= PhiVetoHigh)) {
2026+
continue;
20282027
}
20292028
}
20302029
if (usePtCut) {
@@ -2664,8 +2663,7 @@ struct PseudorapidityDensityMFT {
26642663
std::abs(parentPdg) != PDG_t::kLambda0) {
26652664
continue;
26662665
}
2667-
const int parentSpecies = parentPdg == PDG_t::kK0Short ? 1 :
2668-
(parentPdg == PDG_t::kLambda0 ? 2 : 3);
2666+
const int parentSpecies = parentPdg == PDG_t::kK0Short ? 1 : (parentPdg == PDG_t::kLambda0 ? 2 : 3);
26692667
registry.fill(HIST("Strangeness/Mid/RecoStrangeEtaZvtx"),
26702668
centralTrack.eta(), z,
26712669
centralTrack.dcaXY(), centralTrack.dcaZ(), parentSpecies);
@@ -2878,8 +2876,7 @@ struct PseudorapidityDensityMFT {
28782876
// excludes fake labels and counts only matched secondaries.
28792877
if (isSecondaryCharged) {
28802878
const int parentSpecies =
2881-
mcpartMother.pdgCode() == PDG_t::kK0Short ? 1 :
2882-
(mcpartMother.pdgCode() == PDG_t::kLambda0 ? 2 : 3);
2879+
mcpartMother.pdgCode() == PDG_t::kK0Short ? 1 : (mcpartMother.pdgCode() == PDG_t::kLambda0 ? 2 : 3);
28832880
registry.fill(HIST("Strangeness/Fwd/RecoStrangeEtaZvtx"),
28842881
etaReco, z, dcaXYReco, dcaZReco, parentSpecies);
28852882
}
@@ -3293,7 +3290,7 @@ struct PseudorapidityDensityMFT {
32933290
((phi >= PhiVetoPiMin) && (phi <= PhiVetoPiMax)) ||
32943291
(phi >= PhiVetoHigh)) {
32953292
continue;
3296-
}
3293+
}
32973294
}
32983295
if (usePtCut) {
32993296
if (ptCut > cfgnPt) {
@@ -3306,44 +3303,44 @@ struct PseudorapidityDensityMFT {
33063303
mcCollision.posZ());
33073304
registry.fill(HIST("TracksPtEtaGen_t"), particle.pt(), particle.eta());
33083305
}
3309-
if ( mcCollision.posZ() >= cfgVzCut1 && mcCollision.posZ() <= cfgVzCut2) {
3306+
if (mcCollision.posZ() >= cfgVzCut1 && mcCollision.posZ() <= cfgVzCut2) {
33103307
registry.fill(HIST("TracksEtaZvtxGen_gt0t"), particle.eta(),
33113308
mcCollision.posZ());
33123309
registry.fill(HIST("TracksPhiEtaGen_gt0t"), particle.phi(), particle.eta());
3313-
3314-
if ( nChargedCentral > 0) {
3315-
if (particle.isPhysicalPrimary()) {
3316-
registry.fill(HIST("TracksEtaZvtxGen_gt0t_primary"), particle.eta(), mcCollision.posZ());
3317-
}
3318-
registry.fill(HIST("TracksEtaZvtxGen"), particle.eta(),
3319-
mcCollision.posZ());
3320-
registry.fill(HIST("TracksPtEtaGen"), particle.pt(), particle.eta());
3321-
registry.fill(HIST("TracksPhiEtaGen"), particle.phi(), particle.eta());
3322-
registry.fill(HIST("TracksPhiZvtxGen"), particle.phi(),
3323-
mcCollision.posZ());
3324-
if (particle.isPhysicalPrimary()) {
3325-
registry.fill(HIST("Purity/mc/PrimaryAll"), static_cast<int>(SingleCountBin::Count));
3326-
registry.fill(HIST("Purity/mc/PrimaryAllEta"), particle.eta());
3327-
registry.fill(HIST("Purity/mc/PrimaryTracksEtaZvtx"), particle.eta(), mcCollision.posZ());
3328-
registry.fill(HIST("Purity/mc/PrimaryTracksPhiEta"), particle.phi(), particle.eta());
3329-
}
33303310

3331-
if (atLeastOneSel8VzGt0) {
3332-
registry.fill(HIST("TracksEtaZvtxGen_gt0"), particle.eta(),
3311+
if (nChargedCentral > 0) {
3312+
if (particle.isPhysicalPrimary()) {
3313+
registry.fill(HIST("TracksEtaZvtxGen_gt0t_primary"), particle.eta(), mcCollision.posZ());
3314+
}
3315+
registry.fill(HIST("TracksEtaZvtxGen"), particle.eta(),
3316+
mcCollision.posZ());
3317+
registry.fill(HIST("TracksPtEtaGen"), particle.pt(), particle.eta());
3318+
registry.fill(HIST("TracksPhiEtaGen"), particle.phi(), particle.eta());
3319+
registry.fill(HIST("TracksPhiZvtxGen"), particle.phi(),
33333320
mcCollision.posZ());
3334-
registry.fill(HIST("TracksPhiEtaGen_gt0"), particle.phi(), particle.eta());
33353321
if (particle.isPhysicalPrimary()) {
3336-
registry.fill(HIST("TracksEtaZvtxGen_gt0_primary"), particle.eta(), mcCollision.posZ());
3337-
registry.fill(HIST("TracksPhiEtaGen_gt0_primary"), particle.phi(), particle.eta());
3338-
registry.fill(HIST("TracksPtZvtxGen_gt0_primary"), particle.pt(), mcCollision.posZ());
3339-
registry.fill(HIST("Purity/mc/PrimaryTracksEtaZvtx_gt0"), particle.eta(), mcCollision.posZ());
3340-
registry.fill(HIST("Purity/mc/PrimaryTracksPtZvtx_gt0"), particle.pt(), mcCollision.posZ());
3341-
// registry.fill(HIST("Purity/mc/PrimaryTracksDCAxyZvtx_gt0"), dcaXyCut, mcCollision.posZ());
3342-
// registry.fill(HIST("Purity/mc/PrimaryTracksDCAzZvtx_gt0"), dcaZCut, mcCollision.posZ());
3322+
registry.fill(HIST("Purity/mc/PrimaryAll"), static_cast<int>(SingleCountBin::Count));
3323+
registry.fill(HIST("Purity/mc/PrimaryAllEta"), particle.eta());
3324+
registry.fill(HIST("Purity/mc/PrimaryTracksEtaZvtx"), particle.eta(), mcCollision.posZ());
3325+
registry.fill(HIST("Purity/mc/PrimaryTracksPhiEta"), particle.phi(), particle.eta());
3326+
}
3327+
3328+
if (atLeastOneSel8VzGt0) {
3329+
registry.fill(HIST("TracksEtaZvtxGen_gt0"), particle.eta(),
3330+
mcCollision.posZ());
3331+
registry.fill(HIST("TracksPhiEtaGen_gt0"), particle.phi(), particle.eta());
3332+
if (particle.isPhysicalPrimary()) {
3333+
registry.fill(HIST("TracksEtaZvtxGen_gt0_primary"), particle.eta(), mcCollision.posZ());
3334+
registry.fill(HIST("TracksPhiEtaGen_gt0_primary"), particle.phi(), particle.eta());
3335+
registry.fill(HIST("TracksPtZvtxGen_gt0_primary"), particle.pt(), mcCollision.posZ());
3336+
registry.fill(HIST("Purity/mc/PrimaryTracksEtaZvtx_gt0"), particle.eta(), mcCollision.posZ());
3337+
registry.fill(HIST("Purity/mc/PrimaryTracksPtZvtx_gt0"), particle.pt(), mcCollision.posZ());
3338+
// registry.fill(HIST("Purity/mc/PrimaryTracksDCAxyZvtx_gt0"), dcaXyCut, mcCollision.posZ());
3339+
// registry.fill(HIST("Purity/mc/PrimaryTracksDCAzZvtx_gt0"), dcaZCut, mcCollision.posZ());
3340+
}
33433341
}
33443342
}
33453343
}
3346-
}
33473344
if (particle.isPhysicalPrimary()) {
33483345

33493346
++nGenPrimaryChargedMFT;

0 commit comments

Comments
 (0)