From d4ccb72769bbc8f17c0b76299ad9f0e44779a741 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Thu, 25 Sep 2025 14:19:15 +0200 Subject: [PATCH 1/2] dev: allowing split runs --- PWGLF/Tasks/Strangeness/nonPromptCascade.cxx | 39 ++++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx index d5e93102df0..975eaf7bfaf 100644 --- a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx +++ b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx @@ -213,11 +213,11 @@ struct NonPromptCascadeTask { o2::vertexing::DCAFitterN<2> mDCAFitter; std::array mProcessCounter = {0, 0}; // {Tracked, All} std::map mToiMap; - std::unordered_set mRuns; - std::shared_ptr mHistPointer1; - std::shared_ptr mHistPointer2; - std::shared_ptr mHistPointer3; - std::shared_ptr mHistPointer4; + std::unordered_map> mHistsPerRunMultVsCent; + std::unordered_map> mHistsPerRunMultVsCentZoom; + std::unordered_map> mHistsPerRunNtracktVsCent; + std::unordered_map> mHistsPerRunNtracktVsCentZoom; + AxisSpec multAxis = {10000, 0, 10000, "Multiplicity FT0M"}; AxisSpec centAxis = {2021, -0.025, 101.025, "Centrality"}; AxisSpec centAxisZoom = {2000, -0.0025, 10.0025, "Centrality"}; @@ -338,22 +338,21 @@ struct NonPromptCascadeTask { { // std::cout << "Filling mult histos" << std::endl; for (const auto& coll : collisions) { - if (!mRuns.count(mRunNumber)) { - std::string histName = "mult/hMultVsCent_run" + std::to_string(mRunNumber); - mHistPointer1 = std::get>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxis, multAxis})); - histName = "mult/hMultVsCentZoom_run" + std::to_string(mRunNumber); - mHistPointer2 = std::get>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxisZoom, multAxisZoom})); - histName = "mult/hNTracksVsCent_run" + std::to_string(mRunNumber); - mHistPointer3 = std::get>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxis, nTracksAxis})); - histName = "mult/hNTracksVsCentZoom_run" + std::to_string(mRunNumber); - mHistPointer4 = std::get>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxisZoom, nTracksAxis})); - mRuns.insert(mRunNumber); + std::string histNameMvC = "mult/hMultVsCent_run" + std::to_string(mRunNumber); + std::string histNameMvCZ = "mult/hMultVsCentZoom_run" + std::to_string(mRunNumber); + std::string histNameTvC = "mult/hNTracksVsCent_run" + std::to_string(mRunNumber); + std::string histNameTvCZ = "mult/hNTracksVsCentZoom_run" + std::to_string(mRunNumber); + if(!mHistsPerRunMultVsCent.contains(histNameMvC)) { + mHistsPerRunMultVsCent[histNameMvC] = std::get>(mRegistry.add(histNameMvC.c_str(), histNameMvC.c_str(), HistType::kTH2F, {centAxis, multAxis})); + mHistsPerRunMultVsCentZoom[histNameMvCZ] = std::get>(mRegistry.add(histNameMvCZ.c_str(), histNameMvCZ.c_str(), HistType::kTH2F, {centAxisZoom, multAxisZoom})); + mHistsPerRunNtracktVsCent[histNameTvC] = std::get>(mRegistry.add(histNameTvC.c_str(), histNameTvC.c_str(), HistType::kTH2F, {centAxis, nTracksAxis})); + mHistsPerRunNtracktVsCentZoom[histNameTvCZ] = std::get>(mRegistry.add(histNameTvCZ.c_str(), histNameTvCZ.c_str(), HistType::kTH2F, {centAxisZoom, nTracksAxis})); } - mHistPointer1->Fill(coll.centFT0M(), coll.multFT0M()); - mHistPointer2->Fill(coll.centFT0M(), coll.multFT0M()); - mHistPointer3->Fill(coll.centFT0M(), coll.multNTracksGlobal()); - mHistPointer4->Fill(coll.centFT0M(), coll.multNTracksGlobal()); - + mHistsPerRunMultVsCent[histNameMvC]->Fill(coll.centFT0M(), coll.multFT0M()); + mHistsPerRunMultVsCentZoom[histNameMvCZ]->Fill(coll.centFT0M(), coll.multFT0M()); + mHistsPerRunNtracktVsCent[histNameTvC]->Fill(coll.centFT0M(), coll.multNTracksGlobal()); + mHistsPerRunNtracktVsCentZoom[histNameTvCZ]->Fill(coll.centFT0M(), coll.multNTracksGlobal()); + // run integrated histos mRegistry.fill(HIST("hMultVsCent"), coll.centFT0M(), coll.multFT0M()); mRegistry.fill(HIST("hMultVsCentZoom"), coll.centFT0M(), coll.multFT0M()); mRegistry.fill(HIST("hNTracksVsCent"), coll.centFT0M(), (float)coll.multNTracksGlobal()); From eb09e3727342a9d244fd2a552817b60ca6709e97 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Thu, 25 Sep 2025 14:20:28 +0200 Subject: [PATCH 2/2] clang --- PWGLF/Tasks/Strangeness/nonPromptCascade.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx index 975eaf7bfaf..d5ada008d62 100644 --- a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx +++ b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx @@ -342,7 +342,7 @@ struct NonPromptCascadeTask { std::string histNameMvCZ = "mult/hMultVsCentZoom_run" + std::to_string(mRunNumber); std::string histNameTvC = "mult/hNTracksVsCent_run" + std::to_string(mRunNumber); std::string histNameTvCZ = "mult/hNTracksVsCentZoom_run" + std::to_string(mRunNumber); - if(!mHistsPerRunMultVsCent.contains(histNameMvC)) { + if (!mHistsPerRunMultVsCent.contains(histNameMvC)) { mHistsPerRunMultVsCent[histNameMvC] = std::get>(mRegistry.add(histNameMvC.c_str(), histNameMvC.c_str(), HistType::kTH2F, {centAxis, multAxis})); mHistsPerRunMultVsCentZoom[histNameMvCZ] = std::get>(mRegistry.add(histNameMvCZ.c_str(), histNameMvCZ.c_str(), HistType::kTH2F, {centAxisZoom, multAxisZoom})); mHistsPerRunNtracktVsCent[histNameTvC] = std::get>(mRegistry.add(histNameTvC.c_str(), histNameTvC.c_str(), HistType::kTH2F, {centAxis, nTracksAxis}));