Skip to content

Commit fbba76f

Browse files
AlexianLAlexianL
authored
Merge pull request #12 from alibuild/alibot-cleanup-8605
Please consider the following formatting changes to AliceO2Group#8605
2 parents 2a56fe9 + 07f3a9c commit fbba76f

File tree

1 file changed

+32
-37
lines changed

1 file changed

+32
-37
lines changed

‎PWGHF/HFC/Tasks/taskFlow.cxx‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ struct HfTaskFlow {
246246
registry.add("Data/TpcTpc/HfHadron/SameEvent/hPhi", "phi", {HistType::kTH1F, {{100, 0, TwoPI, "#varphi"}}});
247247
registry.add("Data/TpcTpc/HfHadron/SameEvent/hYields", "multiplicity vs pT vs eta", {HistType::kTH3F, {{200, 0, 200, "multiplicity"}, {40, 0, 20, "p_{T}"}, {100, -2, 2, "#eta"}}});
248248
registry.add("Data/TpcTpc/HfHadron/SameEvent/hEtaPhi", "multiplicity vs eta vs phi", {HistType::kTH3F, {{200, 0, 200, "multiplicity"}, {100, -2, 2, "#eta"}, {200, 0, TwoPI, "#varphi"}}});
249-
249+
250250
registry.add("Data/TpcTpc/HfHadron/SameEvent/2Prong/hEventCountSame", "bin", {HistType::kTH1F, {{nBinsMix + 2, -2.5, -0.5 + nBinsMix, "bin"}}});
251251
registry.add("Data/TpcTpc/HfHadron/SameEvent/2Prong/hEta", "eta", {HistType::kTH1F, {{100, -4, 4, "#eta"}}});
252252
registry.add("Data/TpcTpc/HfHadron/SameEvent/2Prong/hPhi", "phi", {HistType::kTH1F, {{100, 0, TwoPI, "#varphi"}}});
@@ -286,7 +286,6 @@ struct HfTaskFlow {
286286
// DATA : histograms for TPC-TPC HF-h case for 3PRONG
287287
// ===================
288288

289-
290289
registry.add("Data/TpcTpc/HfHadron/SameEvent/3Prong/hEventCountSame", "bin", {HistType::kTH1F, {{nBinsMix + 2, -2.5, -0.5 + nBinsMix, "bin"}}});
291290
registry.add("Data/TpcTpc/HfHadron/SameEvent/3Prong/hMassVsPt", "3-prong candidates;inv. mass (#pi K) (GeV/#it{c}^{2});entries", {HistType::kTH2F, {{500, 0., 5.}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
292291
registry.add("Data/TpcTpc/HfHadron/SameEvent/3Prong/hMass", "3-prong candidates;inv. mass (#pi K) (GeV/#it{c}^{2});entries", {HistType::kTH1F, {{100, 0., 10.}}});
@@ -428,7 +427,6 @@ struct HfTaskFlow {
428427
// DATA : histograms for TPC-MFT HF-h case FOR 3PRONG
429428
// =========================
430429

431-
432430
registry.add("Data/TpcMft/HfHadron/SameEvent/3Prong/hEventCountSame", "bin", {HistType::kTH1F, {{nBinsMix + 2, -2.5, -0.5 + nBinsMix, "bin"}}});
433431
registry.add("Data/TpcMft/HfHadron/SameEvent/3Prong/hYieldsCandidate", "multiplicity vs pT vs eta", {HistType::kTH3F, {{200, 0, 200, "multiplicity"}, {40, 0, 20, "p_{T}"}, {100, -2, 2, "#eta"}}});
434432
registry.add("Data/TpcMft/HfHadron/SameEvent/3Prong/hNtracksCandidate", "hNtracks", {HistType::kTH1F, {{500, 0, 500}}});
@@ -628,8 +626,8 @@ struct HfTaskFlow {
628626
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hPtTPC"), track.pt());
629627
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hYieldsTPC"), multiplicity, track.pt(), track.eta());
630628
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hMultiplicityTPC"), multiplicity);
631-
//add multiplicity plot?
632-
} else { // associated hadron from MFT
629+
// add multiplicity plot?
630+
} else { // associated hadron from MFT
633631
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hEtaMFT"), track.eta());
634632
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hPhiMFT"), phi);
635633
registry.fill(HIST("Data/TpcMft/HadronHadron/SameEvent/hEtaPhiMFT"), multiplicity, track.eta(), phi);
@@ -639,7 +637,7 @@ struct HfTaskFlow {
639637
}
640638

641639
// ---- DATA : TPC-MFT HF-h Same Event QA ----
642-
640+
643641
template <typename TTrack>
644642
void fillTpcMftHfChSameEventQa(float multiplicity, TTrack const& track)
645643
{
@@ -652,9 +650,8 @@ struct HfTaskFlow {
652650
registry.fill(HIST("Data/TpcMft/HfHadron/SameEvent/hEtaPhiMFT"), multiplicity, track.eta(), phi);
653651
registry.fill(HIST("Data/TpcMft/HfHadron/SameEvent/hPtMFT"), track.pt());
654652
registry.fill(HIST("Data/TpcMft/HfHadron/SameEvent/hYieldsMFT"), multiplicity, track.pt(), track.eta());
655-
//add plot for multiplicity ?
653+
// add plot for multiplicity ?
656654
}
657-
658655

659656
// ---- DATA : TPC-TPC HF-h Same Event (Candidates) QA ----
660657
// TODO: Note: we do not need all these plots since they are in D0 and Lc task -> remove it after we are sure this works
@@ -674,7 +671,7 @@ struct HfTaskFlow {
674671
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/2Prong/hMassVsPt"), hfHelper.invMassD0barToKPi(candidate), candidate.pt());
675672
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/2Prong/hMass"), hfHelper.invMassD0barToKPi(candidate));
676673
}
677-
674+
678675
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/2Prong/hMultiplicity"), multiplicity);
679676
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/2Prong/hEta"), candidate.eta());
680677
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/2Prong/hPhi"), phi);
@@ -761,7 +758,6 @@ struct HfTaskFlow {
761758
registry.fill(HIST("Data/TpcTpc/HfHadron/SameEvent/3Prong/hDecLenErr"), candidate.errorDecayLength(), pt);
762759
}
763760

764-
765761
// ---- DATA : TPC-MFT HF-h Same Event (Candidates) QA ----
766762
// TODO: Note: we do not need all these plots since they are in D0 and Lc task -> remove it after we are sure this works
767763
template <typename TTrack>
@@ -804,7 +800,7 @@ struct HfTaskFlow {
804800

805801
// ---- DATA : TPC-MFT HF-h Same Event (Candidates) QA ----
806802
// TODO: Note: we do not need all these plots since they are in D0 and Lc task -> remove it after we are sure this works
807-
803+
808804
template <typename TTrack>
809805
void fillTpcMftLcCandidateQa(float multiplicity, TTrack const& candidate)
810806
{
@@ -868,9 +864,9 @@ struct HfTaskFlow {
868864
registry.fill(HIST("Data/TpcMft/HfHadron/SameEvent/3Prong/hDecLenErr"), candidate.errorDecayLength(), pt);
869865
}
870866

871-
// =========================
872-
// Quality Assesment plots for Mixed Event
873-
// =========================
867+
// =========================
868+
// Quality Assesment plots for Mixed Event
869+
// =========================
874870

875871
// ---- DATA : TPC-TPC h-h Mixed Event QA ----
876872
template <typename TTracks>
@@ -1027,7 +1023,6 @@ struct HfTaskFlow {
10271023
// Cuts with functions
10281024
// =========================
10291025

1030-
10311026
// FIXME: Some collisions are rejected here, what causes (part of) differences with the D0 task
10321027
template <typename TCollision>
10331028
bool isCollisionSelected(TCollision const& collision, bool fillHistograms = false)
@@ -1046,7 +1041,7 @@ struct HfTaskFlow {
10461041

10471042
return true;
10481043
}
1049-
1044+
10501045
// TODO: Check how to put this into a Filter
10511046
template <typename TTrack>
10521047
bool isAcceptedCandidate(TTrack const& candidate)
@@ -1119,9 +1114,9 @@ struct HfTaskFlow {
11191114
auto triggerWeight = 1;
11201115
auto associatedWeight = 1;
11211116

1122-
//To avoid filling associated tracks QA many times
1123-
// I fill it only for the first trigger track of the collision
1124-
auto loopCounter = 0;
1117+
// To avoid filling associated tracks QA many times
1118+
// I fill it only for the first trigger track of the collision
1119+
auto loopCounter = 0;
11251120

11261121
for (const auto& track1 : tracks1) {
11271122

@@ -1174,16 +1169,16 @@ struct HfTaskFlow {
11741169

11751170
// FILL QA PLOTS for trigger particle
11761171
if (sameEvent) {
1177-
//if constexpr (std::is_same_v<FilteredCollisionsWSelMult, TCollisions>) { // If DATA
1178-
if constexpr (!std::is_same_v<aod::MFTTracks, TTracksAssoc>) { // IF TPC-TPC case
1179-
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-TPC D0-h
1172+
// if constexpr (std::is_same_v<FilteredCollisionsWSelMult, TCollisions>) { // If DATA
1173+
if constexpr (!std::is_same_v<aod::MFTTracks, TTracksAssoc>) { // IF TPC-TPC case
1174+
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-TPC D0-h
11801175
fillTpcTpcD0CandidateQa(multiplicity, track1);
11811176
} else if constexpr (std::is_same_v<HfCandidatesSelLc, TTracksTrig>) { // IF LC CASE -> TPC-TPC Lc-h
11821177
fillTpcTpcLcCandidateQa(multiplicity, track1);
11831178
} else { // IF NEITHER D0 NOR LC -> TPC-TPC h-h
11841179
fillTpcTpcChChSameEventQa(multiplicity, track1);
11851180
}
1186-
} else { // IF TPC-MFT case
1181+
} else { // IF TPC-MFT case
11871182
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-MFT D0-h
11881183
fillTpcMftD0CandidateQa(multiplicity, track1);
11891184
} else if constexpr (std::is_same_v<HfCandidatesSelLc, TTracksTrig>) { // IF LC CASE -> TPC-MFT Lc-h
@@ -1192,10 +1187,10 @@ struct HfTaskFlow {
11921187
fillTpcMftChChSameEventQa(multiplicity, track1, true);
11931188
} // end of if condition for TPC-TPC or TPC-MFT case
11941189
}
1195-
// Maybe I won't need it for MC (first files are way lighter in MC, but also I need to loop over all tracks in MC GEN)
1196-
//} else { // If MC (add cases later)
1197-
//fillTpcTpcChChSameEventQaMc(multiplicityTracks2, vz, tracks1);
1198-
//}
1190+
// Maybe I won't need it for MC (first files are way lighter in MC, but also I need to loop over all tracks in MC GEN)
1191+
//} else { // If MC (add cases later)
1192+
// fillTpcTpcChChSameEventQaMc(multiplicityTracks2, vz, tracks1);
1193+
//}
11991194
}
12001195

12011196
for (const auto& track2 : tracks2) {
@@ -1263,15 +1258,15 @@ struct HfTaskFlow {
12631258

12641259
// FILL QA PLOTS for associated particle
12651260
if (sameEvent && (loopCounter == 1)) {
1266-
//if constexpr (std::is_same_v<FilteredCollisionsWSelMult, TCollisions>) { // If DATA
1267-
if constexpr (!std::is_same_v<aod::MFTTracks, TTracksAssoc>) { // IF TPC-TPC case
1268-
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-TPC D0-h
1261+
// if constexpr (std::is_same_v<FilteredCollisionsWSelMult, TCollisions>) { // If DATA
1262+
if constexpr (!std::is_same_v<aod::MFTTracks, TTracksAssoc>) { // IF TPC-TPC case
1263+
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-TPC D0-h
12691264
fillTpcTpcHfChSameEventQa(multiplicity, track2);
12701265
} else if constexpr (std::is_same_v<HfCandidatesSelLc, TTracksTrig>) { // IF LC CASE -> TPC-TPC Lc-h
12711266
fillTpcTpcHfChSameEventQa(multiplicity, track2);
12721267
}
1273-
// No if condition if it is h-h, because it would be the same plots than for the trigger particle
1274-
} else { // IF TPC-MFT case
1268+
// No if condition if it is h-h, because it would be the same plots than for the trigger particle
1269+
} else { // IF TPC-MFT case
12751270
if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig>) { // IF D0 CASE -> TPC-MFT D0-h
12761271
fillTpcMftHfChSameEventQa(multiplicity, track2);
12771272
} else if constexpr (std::is_same_v<HfCandidatesSelLc, TTracksTrig>) { // IF LC CASE -> TPC-MFT Lc-h
@@ -1280,9 +1275,9 @@ struct HfTaskFlow {
12801275
fillTpcMftChChSameEventQa(multiplicity, track2, false);
12811276
} // end of if condition for TPC-TPC or TPC-MFT case
12821277
}
1283-
//} else { // If MC (add cases later)
1284-
//fillTpcTpcChChSameEventQaMc(multiplicityTracks2, vz, tracks1);
1285-
//}
1278+
//} else { // If MC (add cases later)
1279+
// fillTpcTpcChChSameEventQaMc(multiplicityTracks2, vz, tracks1);
1280+
//}
12861281
}
12871282

12881283
} // end of loop over tracks2
@@ -1323,7 +1318,7 @@ struct HfTaskFlow {
13231318

13241319
if constexpr (std::is_same_v<FilteredCollisionsWSelMultMC, TCollisions>) { // If MC
13251320
registry.fill(HIST("MC/Rec/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
1326-
//fillTpcTpcChChMixedEventQaMc(multiplicityTracks2, vz, tracks1);
1321+
// fillTpcTpcChChMixedEventQaMc(multiplicityTracks2, vz, tracks1);
13271322

13281323
// if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig> || std::is_same_v<HfCandidatesSelLc, TTracksTrig>) {
13291324
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
@@ -1393,7 +1388,7 @@ struct HfTaskFlow {
13931388
// TO BE DONE : ADD ONE MORE IF CONDITION TO FILL THE MC CASE
13941389
// TODO : FILL NEW PLOTS FOR MCTRUTH ONLY
13951390
registry.fill(HIST("MC/Gen/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
1396-
//fillTpcTpcChChMixedEventQaMc(multiplicity, vz, tracks1);
1391+
// fillTpcTpcChChMixedEventQaMc(multiplicity, vz, tracks1);
13971392

13981393
// if constexpr (std::is_same_v<HfCandidatesSelD0, TTracksTrig> || std::is_same_v<HfCandidatesSelLc, TTracksTrig>) {
13991394
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);

0 commit comments

Comments
 (0)