From 8df4606b85da718a9062ca19538d81cba4d9ed93 Mon Sep 17 00:00:00 2001 From: fchinu Date: Mon, 11 Mar 2024 20:10:12 +0100 Subject: [PATCH 1/5] Reduce number of centrality tables produced --- PWGHF/D2H/Tasks/taskDs.cxx | 201 ++++++++++++++++++++++++------------- 1 file changed, 132 insertions(+), 69 deletions(-) diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index ec7a00a2c86..26a21116eda 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -33,19 +33,15 @@ using namespace o2::framework::expressions; enum finalState { KKPi = 0, PiKK }; -enum centEstimator { FT0A = 0, - FT0C, +enum centEstimator { FT0C = 0, FT0M, - FV0A, - FDDM, NTracksPV, - kNMaxCentEstimators }; + NoCentEstimation}; /// Ds± analysis task struct HfTaskDs { Configurable decayChannel{"decayChannel", 1, "Switch between decay channels: 1 for Ds/Dplus->PhiPi->KKpi, 2 for Ds/Dplus->K0*K->KKPi"}; Configurable fillDplusMc{"fillDplusMc", true, "Switch to fill Dplus MC information"}; - Configurable centDetector{"centDetector", 2, "Detector for multiplicity estimation (FT0A: 0, FT0C: 1, FT0M: 2, FV0A: 3, FDDM:4, NTracksPV: 5)"}; Configurable selectionFlagDs{"selectionFlagDs", 7, "Selection Flag for Ds"}; Configurable> classMl{"classMl", {0, 2, 3}, "Indexes of ML scores to be stored. Three indexes max."}; Configurable yCandGenMax{"yCandGenMax", 0.5, "max. gen particle rapidity"}; @@ -54,7 +50,9 @@ struct HfTaskDs { HfHelper hfHelper; - using CollisionsWithCent = soa::Join; + using CollisionsWithFT0C = soa::Join; + using CollisionsWithFT0M = soa::Join; + using CollisionsWithNTracksPV = soa::Join; using CandDsData = soa::Filtered>; using CandDsDataWithMl = soa::Filtered>; using CandDsMcReco = soa::Filtered>; @@ -104,8 +102,8 @@ struct HfTaskDs { void init(InitContext&) { - std::array processes = {doprocessDataWithCent, doprocessData, doprocessDataWithMlAndCent, doprocessDataWithMl, - doprocessMcWithCent, doprocessMc, doprocessMcWithMlAndCent, doprocessMcWithMl}; + std::array processes = {doprocessDataWithCentFT0, doprocessDataWithCentFT0M, doprocessDataWithCentNTracksPV, doprocessData, doprocessDataWithMlAndCentFT0, doprocessDataWithMlAndCentFT0M, doprocessDataWithMlAndCentNTracksPV, doprocessDataWithMl, doprocessMcWithCentFT0, doprocessMcWithCentFT0M, doprocessMcWithCentNTracksPV, doprocessMc, doprocessMcWithMlAndCentFT0, doprocessMcWithMlAndCentFT0M, doprocessMcWithMlAndCentNTracksPV, doprocessMcWithMl}; + const int nProcesses = std::accumulate(processes.begin(), processes.end(), 0); if (nProcesses > 1) { LOGP(fatal, "Only one process function should be enabled at a time, please check your configuration"); @@ -113,9 +111,6 @@ struct HfTaskDs { LOGP(fatal, "No process function enabled"); } - if (centDetector < 0 || centDetector >= centEstimator::kNMaxCentEstimators) - LOG(warning) << "Centrality estimator not valid. Please choose between FT0A, FT0C, FT0M, FV0A, FDDM, NTracksPV. Fallback to FT0M"; - auto vbins = (std::vector)binsPt; AxisSpec ptbins = {vbins, "#it{p}_{T} (GeV/#it{c})"}; AxisSpec ybins = {100, -5., 5, "#it{y}"}; @@ -123,9 +118,11 @@ struct HfTaskDs { AxisSpec MLbins = {100, 0., 1., "ML output"}; AxisSpec centralitybins = {100, 0., 100., "Centrality"}; - if (doprocessDataWithCent || doprocessMcWithCent) { + if (doprocessDataWithCentFT0 || doprocessDataWithCentFT0M || doprocessDataWithCentNTracksPV || + doprocessMcWithCentFT0 || doprocessMcWithCentFT0M || doprocessMcWithCentNTracksPV) { registry.add("hSparseMass", "THn for Ds", HistType::kTHnSparseF, {massbins, ptbins, centralitybins}); - } else if (doprocessDataWithMlAndCent || doprocessMcWithMlAndCent) { + } else if (doprocessDataWithMlAndCentFT0 || doprocessDataWithMlAndCentFT0M || doprocessDataWithMlAndCentNTracksPV || + doprocessMcWithMlAndCentFT0 || doprocessMcWithMlAndCentFT0M || doprocessMcWithMlAndCentNTracksPV) { registry.add("hSparseMass", "THn for Ds", HistType::kTHnSparseF, {massbins, ptbins, centralitybins, MLbins, MLbins, MLbins}); } else if (doprocessData || doprocessMc) { registry.add("hSparseMass", "THn for Ds", HistType::kTHnSparseF, {massbins, ptbins}); @@ -196,25 +193,15 @@ struct HfTaskDs { /// Evaluate multiplicity /// \param candidate is candidate /// \return multiplicity of the collision associated to the candidate - template + template int evaluateCentrality(const T1& candidate) { - switch (centDetector) { - case centEstimator::FT0A: - return candidate.template collision_as().centFT0A(); - case centEstimator::FT0C: - return candidate.template collision_as().centFT0C(); - case centEstimator::FT0M: - return candidate.template collision_as().centFT0M(); - case centEstimator::FV0A: - return candidate.template collision_as().centFV0A(); - case centEstimator::FDDM: - return candidate.template collision_as().centFDDM(); - case centEstimator::NTracksPV: - return candidate.template collision_as().centNTPV(); - default: // In case of invalid configuration use FT0M - return candidate.template collision_as().centFT0M(); - } + if constexpr (centDetector == centEstimator::FT0C) + return candidate.template collision_as().centFT0C(); + else if constexpr (centDetector == centEstimator::FT0M) + return candidate.template collision_as().centFT0M(); + else if constexpr (centDetector == centEstimator::NTracksPV) + return candidate.template collision_as().centNTPV(); } /// Fill histograms of quantities independent from the daugther-mass hypothesis @@ -250,7 +237,7 @@ struct HfTaskDs { /// Fill histograms of quantities for the KKPi daugther-mass hypothesis /// \param candidate is candidate - template + template void fillHistoKKPi(const T1& candidate) { auto pt = candidate.pt(); @@ -259,14 +246,14 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToKKPi()[classMl->at(iclass)]; } - if constexpr (fillCent) { - registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); + if constexpr (centDetector != centEstimator::NoCentEstimation) { + registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (fillCent) { - registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate)); + if constexpr (centDetector != centEstimator::NoCentEstimation) { + registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt); } @@ -280,7 +267,7 @@ struct HfTaskDs { /// Fill histograms of quantities for the PiKK daugther-mass hypothesis /// \param candidate is candidate - template + template void fillHistoPiKK(const T1& candidate) { auto pt = candidate.pt(); @@ -289,14 +276,14 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToPiKK()[classMl->at(iclass)]; } - if constexpr (fillCent) { - registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); + if constexpr (centDetector != centEstimator::NoCentEstimation) { + registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (fillCent) { - registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate)); + if constexpr (centDetector != centEstimator::NoCentEstimation) { + registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt); } @@ -433,7 +420,7 @@ struct HfTaskDs { } } - template + template void runDataAnalysis(CandsDs const& candidates) { for (const auto& candidate : candidates) { @@ -442,9 +429,9 @@ struct HfTaskDs { } fillHisto(candidate); if constexpr (decayChannel == finalState::KKPi) { // KKPi - fillHistoKKPi(candidate); + fillHistoKKPi(candidate); } else if constexpr (decayChannel == finalState::PiKK) { // PiKK - fillHistoPiKK(candidate); + fillHistoPiKK(candidate); } } } @@ -542,48 +529,102 @@ struct HfTaskDs { } } - void processDataWithCent(CollisionsWithCent const&, - CandDsData const& candidates) + void processDataWithCentFT0( CollisionsWithFT0C const&, + CandDsData const& candidates) + { + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); + } + PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0, "Process data w/o ML information on Ds, with information on centrality from FT0C", false); + + void processDataWithCentFT0M( CollisionsWithFT0M const&, + CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } - PROCESS_SWITCH(HfTaskDs, processDataWithCent, "Process data w/o ML information on Ds, with information on centrality", false); + PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0M, "Process data w/o ML information on Ds, with information on centrality from FT0M", false); + + void processDataWithCentNTracksPV(CollisionsWithNTracksPV const&, + CandDsData const& candidates) + { + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); + } + PROCESS_SWITCH(HfTaskDs, processDataWithCentNTracksPV, "Process data w/o ML information on Ds, with information on centrality from NTracksPV", false); void processData(aod::Collisions const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processData, "Process data w/o ML information on Ds, w/o information on centrality", true); - void processDataWithMlAndCent(CollisionsWithCent const&, + void processDataWithMlAndCentFT0(CollisionsWithFT0C const&, + CandDsDataWithMl const& candidates) + { + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); + } + PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0, "Process data with ML information on Ds, with information on centrality from FT0C", false); + + void processDataWithMlAndCentFT0M(CollisionsWithFT0M const&, + CandDsDataWithMl const& candidates) + { + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); + } + PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0M, "Process data with ML information on Ds, with information on centrality from FT0M", false); + + void processDataWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } - PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCent, "Process data with ML information on Ds, with information on centrality", false); + PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentNTracksPV, "Process data with ML information on Ds, with information on centrality", false); void processDataWithMl(aod::Collisions const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMl, "Process data with ML information on Ds, w/o information on centrality", false); - void processMcWithCent(CollisionsWithCent const&, + void processMcWithCentFT0(CollisionsWithFT0C const&, + CandDsMcReco const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) + { + runMcAnalysis(candidates, mcParticles); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); + } + PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0, "Process MC w/o ML information on Ds, with information on centrality from FT0C", false); + + void processMcWithCentFT0M(CollisionsWithFT0M const&, CandDsMcReco const& candidates, CandDsMcGen const& mcParticles, aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } - PROCESS_SWITCH(HfTaskDs, processMcWithCent, "Process MC w/o ML information on Ds, with information on centrality", false); + PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0M, "Process MC w/o ML information on Ds, with information on centrality from FT0M", false); + + void processMcWithCentNTracksPV(CollisionsWithNTracksPV const&, + CandDsMcReco const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) + { + runMcAnalysis(candidates, mcParticles); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); + } + PROCESS_SWITCH(HfTaskDs, processMcWithCentNTracksPV, "Process MC w/o ML information on Ds, with information on centrality from NTracksPV", false); void processMc(aod::Collisions const&, CandDsMcReco const& candidates, @@ -591,21 +632,43 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMc, "Process MC w/o ML information on Ds, w/o information on centrality", false); - void processMcWithMlAndCent(CollisionsWithCent const&, + void processMcWithMlAndCentFT0(CollisionsWithFT0C const&, + CandDsMcRecoWithMl const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) + { + runMcAnalysis(candidates, mcParticles); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); + } + PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0, "Process MC with ML information on Ds, with information on centrality from FT0C", false); + + void processMcWithMlAndCentFT0M(CollisionsWithFT0M const&, + CandDsMcRecoWithMl const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) + { + runMcAnalysis(candidates, mcParticles); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); + } + PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0M, "Process MC with ML information on Ds, with information on centrality from FT0M", false); + + void processMcWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, CandDsMcRecoWithMl const& candidates, CandDsMcGen const& mcParticles, aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } - PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCent, "Process MC with ML information on Ds, with information on centrality", false); + PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentNTracksPV, "Process MC with ML information on Ds, with information on centrality from NTracksPV", false); void processMcWithMl(aod::Collisions const&, CandDsMcRecoWithMl const& candidates, @@ -613,8 +676,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMl, "Process MC with ML information on Ds, w/o information on centrality", false); }; From e784085d2c55e469fca4ab13afedae11ff8b9d18 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 11 Mar 2024 20:24:00 +0000 Subject: [PATCH 2/5] Please consider the following formatting changes --- PWGHF/D2H/Tasks/taskDs.cxx | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index 26a21116eda..1d6043aa122 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -36,7 +36,7 @@ enum finalState { KKPi = 0, enum centEstimator { FT0C = 0, FT0M, NTracksPV, - NoCentEstimation}; + NoCentEstimation }; /// Ds± analysis task struct HfTaskDs { @@ -103,7 +103,7 @@ struct HfTaskDs { void init(InitContext&) { std::array processes = {doprocessDataWithCentFT0, doprocessDataWithCentFT0M, doprocessDataWithCentNTracksPV, doprocessData, doprocessDataWithMlAndCentFT0, doprocessDataWithMlAndCentFT0M, doprocessDataWithMlAndCentNTracksPV, doprocessDataWithMl, doprocessMcWithCentFT0, doprocessMcWithCentFT0M, doprocessMcWithCentNTracksPV, doprocessMc, doprocessMcWithMlAndCentFT0, doprocessMcWithMlAndCentFT0M, doprocessMcWithMlAndCentNTracksPV, doprocessMcWithMl}; - + const int nProcesses = std::accumulate(processes.begin(), processes.end(), 0); if (nProcesses > 1) { LOGP(fatal, "Only one process function should be enabled at a time, please check your configuration"); @@ -118,10 +118,10 @@ struct HfTaskDs { AxisSpec MLbins = {100, 0., 1., "ML output"}; AxisSpec centralitybins = {100, 0., 100., "Centrality"}; - if (doprocessDataWithCentFT0 || doprocessDataWithCentFT0M || doprocessDataWithCentNTracksPV || + if (doprocessDataWithCentFT0 || doprocessDataWithCentFT0M || doprocessDataWithCentNTracksPV || doprocessMcWithCentFT0 || doprocessMcWithCentFT0M || doprocessMcWithCentNTracksPV) { registry.add("hSparseMass", "THn for Ds", HistType::kTHnSparseF, {massbins, ptbins, centralitybins}); - } else if (doprocessDataWithMlAndCentFT0 || doprocessDataWithMlAndCentFT0M || doprocessDataWithMlAndCentNTracksPV || + } else if (doprocessDataWithMlAndCentFT0 || doprocessDataWithMlAndCentFT0M || doprocessDataWithMlAndCentNTracksPV || doprocessMcWithMlAndCentFT0 || doprocessMcWithMlAndCentFT0M || doprocessMcWithMlAndCentNTracksPV) { registry.add("hSparseMass", "THn for Ds", HistType::kTHnSparseF, {massbins, ptbins, centralitybins, MLbins, MLbins, MLbins}); } else if (doprocessData || doprocessMc) { @@ -529,16 +529,16 @@ struct HfTaskDs { } } - void processDataWithCentFT0( CollisionsWithFT0C const&, - CandDsData const& candidates) + void processDataWithCentFT0(CollisionsWithFT0C const&, + CandDsData const& candidates) { runDataAnalysis(selectedDsToKKPiCandData); runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0, "Process data w/o ML information on Ds, with information on centrality from FT0C", false); - void processDataWithCentFT0M( CollisionsWithFT0M const&, - CandDsData const& candidates) + void processDataWithCentFT0M(CollisionsWithFT0M const&, + CandDsData const& candidates) { runDataAnalysis(selectedDsToKKPiCandData); runDataAnalysis(selectedDsToPiKKCandData); @@ -562,15 +562,15 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processData, "Process data w/o ML information on Ds, w/o information on centrality", true); void processDataWithMlAndCentFT0(CollisionsWithFT0C const&, - CandDsDataWithMl const& candidates) + CandDsDataWithMl const& candidates) { runDataAnalysis(selectedDsToKKPiCandWithMlData); runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0, "Process data with ML information on Ds, with information on centrality from FT0C", false); - + void processDataWithMlAndCentFT0M(CollisionsWithFT0M const&, - CandDsDataWithMl const& candidates) + CandDsDataWithMl const& candidates) { runDataAnalysis(selectedDsToKKPiCandWithMlData); runDataAnalysis(selectedDsToPiKKCandWithMlData); @@ -578,7 +578,7 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0M, "Process data with ML information on Ds, with information on centrality from FT0M", false); void processDataWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, - CandDsDataWithMl const& candidates) + CandDsDataWithMl const& candidates) { runDataAnalysis(selectedDsToKKPiCandWithMlData); runDataAnalysis(selectedDsToPiKKCandWithMlData); @@ -594,9 +594,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processDataWithMl, "Process data with ML information on Ds, w/o information on centrality", false); void processMcWithCentFT0(CollisionsWithFT0C const&, - CandDsMcReco const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcReco const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandMc); @@ -605,9 +605,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0, "Process MC w/o ML information on Ds, with information on centrality from FT0C", false); void processMcWithCentFT0M(CollisionsWithFT0M const&, - CandDsMcReco const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcReco const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandMc); @@ -616,9 +616,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0M, "Process MC w/o ML information on Ds, with information on centrality from FT0M", false); void processMcWithCentNTracksPV(CollisionsWithNTracksPV const&, - CandDsMcReco const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcReco const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandMc); @@ -638,9 +638,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processMc, "Process MC w/o ML information on Ds, w/o information on centrality", false); void processMcWithMlAndCentFT0(CollisionsWithFT0C const&, - CandDsMcRecoWithMl const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcRecoWithMl const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandWithMlMc); @@ -649,9 +649,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0, "Process MC with ML information on Ds, with information on centrality from FT0C", false); void processMcWithMlAndCentFT0M(CollisionsWithFT0M const&, - CandDsMcRecoWithMl const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcRecoWithMl const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandWithMlMc); @@ -660,9 +660,9 @@ struct HfTaskDs { PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0M, "Process MC with ML information on Ds, with information on centrality from FT0M", false); void processMcWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, - CandDsMcRecoWithMl const& candidates, - CandDsMcGen const& mcParticles, - aod::TracksWMc const&) + CandDsMcRecoWithMl const& candidates, + CandDsMcGen const& mcParticles, + aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); runDataAnalysis(selectedDsToKKPiCandWithMlMc); From 70f2ce74073eb82491cf612fed5172f21e9cd065 Mon Sep 17 00:00:00 2001 From: fchinu Date: Tue, 12 Mar 2024 11:50:55 +0100 Subject: [PATCH 3/5] Use PWGHF enum --- PWGHF/D2H/Tasks/taskDs.cxx | 83 +++++++++---------- .../DataModel/CandidateReconstructionTables.h | 1 + 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index 1d6043aa122..c9113d836e4 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -33,11 +33,6 @@ using namespace o2::framework::expressions; enum finalState { KKPi = 0, PiKK }; -enum centEstimator { FT0C = 0, - FT0M, - NTracksPV, - NoCentEstimation }; - /// Ds± analysis task struct HfTaskDs { Configurable decayChannel{"decayChannel", 1, "Switch between decay channels: 1 for Ds/Dplus->PhiPi->KKpi, 2 for Ds/Dplus->K0*K->KKPi"}; @@ -196,11 +191,11 @@ struct HfTaskDs { template int evaluateCentrality(const T1& candidate) { - if constexpr (centDetector == centEstimator::FT0C) + if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::FT0C) return candidate.template collision_as().centFT0C(); - else if constexpr (centDetector == centEstimator::FT0M) + else if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::FT0M) return candidate.template collision_as().centFT0M(); - else if constexpr (centDetector == centEstimator::NTracksPV) + else if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::NTracksPV) return candidate.template collision_as().centNTPV(); } @@ -246,13 +241,13 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToKKPi()[classMl->at(iclass)]; } - if constexpr (centDetector != centEstimator::NoCentEstimation) { + if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (centDetector != centEstimator::NoCentEstimation) { + if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt); @@ -276,13 +271,13 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToPiKK()[classMl->at(iclass)]; } - if constexpr (centDetector != centEstimator::NoCentEstimation) { + if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (centDetector != centEstimator::NoCentEstimation) { + if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt); @@ -532,64 +527,64 @@ struct HfTaskDs { void processDataWithCentFT0(CollisionsWithFT0C const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0, "Process data w/o ML information on Ds, with information on centrality from FT0C", false); void processDataWithCentFT0M(CollisionsWithFT0M const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0M, "Process data w/o ML information on Ds, with information on centrality from FT0M", false); void processDataWithCentNTracksPV(CollisionsWithNTracksPV const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentNTracksPV, "Process data w/o ML information on Ds, with information on centrality from NTracksPV", false); void processData(aod::Collisions const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processData, "Process data w/o ML information on Ds, w/o information on centrality", true); void processDataWithMlAndCentFT0(CollisionsWithFT0C const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0, "Process data with ML information on Ds, with information on centrality from FT0C", false); void processDataWithMlAndCentFT0M(CollisionsWithFT0M const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0M, "Process data with ML information on Ds, with information on centrality from FT0M", false); void processDataWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentNTracksPV, "Process data with ML information on Ds, with information on centrality", false); void processDataWithMl(aod::Collisions const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMl, "Process data with ML information on Ds, w/o information on centrality", false); @@ -599,8 +594,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0, "Process MC w/o ML information on Ds, with information on centrality from FT0C", false); @@ -610,8 +605,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0M, "Process MC w/o ML information on Ds, with information on centrality from FT0M", false); @@ -621,8 +616,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentNTracksPV, "Process MC w/o ML information on Ds, with information on centrality from NTracksPV", false); @@ -632,8 +627,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMc, "Process MC w/o ML information on Ds, w/o information on centrality", false); @@ -643,8 +638,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0, "Process MC with ML information on Ds, with information on centrality from FT0C", false); @@ -654,8 +649,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0M, "Process MC with ML information on Ds, with information on centrality from FT0M", false); @@ -665,8 +660,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentNTracksPV, "Process MC with ML information on Ds, with information on centrality from NTracksPV", false); @@ -676,8 +671,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMl, "Process MC with ML information on Ds, w/o information on centrality", false); }; diff --git a/PWGHF/DataModel/CandidateReconstructionTables.h b/PWGHF/DataModel/CandidateReconstructionTables.h index 2ba18b47d9e..8bd65217486 100644 --- a/PWGHF/DataModel/CandidateReconstructionTables.h +++ b/PWGHF/DataModel/CandidateReconstructionTables.h @@ -68,6 +68,7 @@ enum CentralityEstimator { FT0C, FT0M, FV0A, + NTracksPV, NCentralityEstimators }; } // namespace hf_collision_centrality From a1c76bc3c69a53d1d0f5e246530320d9aa425f26 Mon Sep 17 00:00:00 2001 From: Bizzzio Date: Tue, 12 Mar 2024 17:13:34 +0100 Subject: [PATCH 4/5] Use enum typenames --- PWGHF/D2H/Tasks/taskDs.cxx | 94 +++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index c9113d836e4..61caabdb61d 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -30,7 +30,7 @@ using namespace o2::analysis; using namespace o2::framework; using namespace o2::framework::expressions; -enum finalState { KKPi = 0, +enum FinalState { KKPi = 0, PiKK }; /// Ds± analysis task @@ -45,6 +45,8 @@ struct HfTaskDs { HfHelper hfHelper; + using CentralityEstimator = CentralityEstimator; + using CollisionsWithFT0C = soa::Join; using CollisionsWithFT0M = soa::Join; using CollisionsWithNTracksPV = soa::Join; @@ -188,14 +190,14 @@ struct HfTaskDs { /// Evaluate multiplicity /// \param candidate is candidate /// \return multiplicity of the collision associated to the candidate - template + template int evaluateCentrality(const T1& candidate) { - if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::FT0C) + if constexpr (centDetector == CentralityEstimator::FT0C) return candidate.template collision_as().centFT0C(); - else if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::FT0M) + else if constexpr (centDetector == CentralityEstimator::FT0M) return candidate.template collision_as().centFT0M(); - else if constexpr (centDetector == o2::aod::hf_collision_centrality::CentralityEstimator::NTracksPV) + else if constexpr (centDetector == CentralityEstimator::NTracksPV) return candidate.template collision_as().centNTPV(); } @@ -232,7 +234,7 @@ struct HfTaskDs { /// Fill histograms of quantities for the KKPi daugther-mass hypothesis /// \param candidate is candidate - template + template void fillHistoKKPi(const T1& candidate) { auto pt = candidate.pt(); @@ -241,13 +243,13 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToKKPi()[classMl->at(iclass)]; } - if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { + if constexpr (centDetector != CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { + if constexpr (centDetector != CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToKKPi(candidate), pt); @@ -262,7 +264,7 @@ struct HfTaskDs { /// Fill histograms of quantities for the PiKK daugther-mass hypothesis /// \param candidate is candidate - template + template void fillHistoPiKK(const T1& candidate) { auto pt = candidate.pt(); @@ -271,13 +273,13 @@ struct HfTaskDs { for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) { // TODO: add checks for classMl size outputMl[iclass] = candidate.mlProbDsToPiKK()[classMl->at(iclass)]; } - if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { + if constexpr (centDetector != CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate), outputMl[0], outputMl[1], outputMl[2]); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, outputMl[0], outputMl[1], outputMl[2]); } } else { - if constexpr (centDetector != o2::aod::hf_collision_centrality::CentralityEstimator::None) { + if constexpr (centDetector != CentralityEstimator::None) { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt, evaluateCentrality(candidate)); } else { registry.fill(HIST("hSparseMass"), hfHelper.invMassDsToPiKK(candidate), pt); @@ -415,7 +417,7 @@ struct HfTaskDs { } } - template + template void runDataAnalysis(CandsDs const& candidates) { for (const auto& candidate : candidates) { @@ -423,9 +425,9 @@ struct HfTaskDs { continue; } fillHisto(candidate); - if constexpr (decayChannel == finalState::KKPi) { // KKPi + if constexpr (decayChannel == FinalState::KKPi) { // KKPi fillHistoKKPi(candidate); - } else if constexpr (decayChannel == finalState::PiKK) { // PiKK + } else if constexpr (decayChannel == FinalState::PiKK) { // PiKK fillHistoPiKK(candidate); } } @@ -527,64 +529,64 @@ struct HfTaskDs { void processDataWithCentFT0(CollisionsWithFT0C const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0, "Process data w/o ML information on Ds, with information on centrality from FT0C", false); void processDataWithCentFT0M(CollisionsWithFT0M const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentFT0M, "Process data w/o ML information on Ds, with information on centrality from FT0M", false); void processDataWithCentNTracksPV(CollisionsWithNTracksPV const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processDataWithCentNTracksPV, "Process data w/o ML information on Ds, with information on centrality from NTracksPV", false); void processData(aod::Collisions const&, CandDsData const& candidates) { - runDataAnalysis(selectedDsToKKPiCandData); - runDataAnalysis(selectedDsToPiKKCandData); + runDataAnalysis(selectedDsToKKPiCandData); + runDataAnalysis(selectedDsToPiKKCandData); } PROCESS_SWITCH(HfTaskDs, processData, "Process data w/o ML information on Ds, w/o information on centrality", true); void processDataWithMlAndCentFT0(CollisionsWithFT0C const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0, "Process data with ML information on Ds, with information on centrality from FT0C", false); void processDataWithMlAndCentFT0M(CollisionsWithFT0M const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentFT0M, "Process data with ML information on Ds, with information on centrality from FT0M", false); void processDataWithMlAndCentNTracksPV(CollisionsWithNTracksPV const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMlAndCentNTracksPV, "Process data with ML information on Ds, with information on centrality", false); void processDataWithMl(aod::Collisions const&, CandDsDataWithMl const& candidates) { - runDataAnalysis(selectedDsToKKPiCandWithMlData); - runDataAnalysis(selectedDsToPiKKCandWithMlData); + runDataAnalysis(selectedDsToKKPiCandWithMlData); + runDataAnalysis(selectedDsToPiKKCandWithMlData); } PROCESS_SWITCH(HfTaskDs, processDataWithMl, "Process data with ML information on Ds, w/o information on centrality", false); @@ -594,8 +596,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0, "Process MC w/o ML information on Ds, with information on centrality from FT0C", false); @@ -605,8 +607,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentFT0M, "Process MC w/o ML information on Ds, with information on centrality from FT0M", false); @@ -616,8 +618,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMcWithCentNTracksPV, "Process MC w/o ML information on Ds, with information on centrality from NTracksPV", false); @@ -627,8 +629,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandMc); - runDataAnalysis(selectedDsToPiKKCandMc); + runDataAnalysis(selectedDsToKKPiCandMc); + runDataAnalysis(selectedDsToPiKKCandMc); } PROCESS_SWITCH(HfTaskDs, processMc, "Process MC w/o ML information on Ds, w/o information on centrality", false); @@ -638,8 +640,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0, "Process MC with ML information on Ds, with information on centrality from FT0C", false); @@ -649,8 +651,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentFT0M, "Process MC with ML information on Ds, with information on centrality from FT0M", false); @@ -660,8 +662,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMlAndCentNTracksPV, "Process MC with ML information on Ds, with information on centrality from NTracksPV", false); @@ -671,8 +673,8 @@ struct HfTaskDs { aod::TracksWMc const&) { runMcAnalysis(candidates, mcParticles); - runDataAnalysis(selectedDsToKKPiCandWithMlMc); - runDataAnalysis(selectedDsToPiKKCandWithMlMc); + runDataAnalysis(selectedDsToKKPiCandWithMlMc); + runDataAnalysis(selectedDsToPiKKCandWithMlMc); } PROCESS_SWITCH(HfTaskDs, processMcWithMl, "Process MC with ML information on Ds, w/o information on centrality", false); }; From 52657463bd28024b18e76dada2b598e549a0190a Mon Sep 17 00:00:00 2001 From: Bizzzio Date: Tue, 12 Mar 2024 17:21:36 +0100 Subject: [PATCH 5/5] Fix --- PWGHF/D2H/Tasks/taskDs.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/D2H/Tasks/taskDs.cxx b/PWGHF/D2H/Tasks/taskDs.cxx index 61caabdb61d..9c9106dc7ce 100644 --- a/PWGHF/D2H/Tasks/taskDs.cxx +++ b/PWGHF/D2H/Tasks/taskDs.cxx @@ -45,7 +45,7 @@ struct HfTaskDs { HfHelper hfHelper; - using CentralityEstimator = CentralityEstimator; + using CentralityEstimator = o2::aod::hf_collision_centrality::CentralityEstimator; using CollisionsWithFT0C = soa::Join; using CollisionsWithFT0M = soa::Join;