@@ -213,11 +213,11 @@ struct NonPromptCascadeTask {
213213 o2::vertexing::DCAFitterN<2 > mDCAFitter ;
214214 std::array<int , 2 > mProcessCounter = {0 , 0 }; // {Tracked, All}
215215 std::map<uint64_t , uint32_t > mToiMap ;
216- std::unordered_set< int > mRuns ;
217- std::shared_ptr<TH2> mHistPointer1 ;
218- std::shared_ptr<TH2> mHistPointer2 ;
219- std::shared_ptr<TH2> mHistPointer3 ;
220- std::shared_ptr<TH2> mHistPointer4 ;
216+ std::unordered_map<std::string, std::shared_ptr<TH2>> mHistsPerRunMultVsCent ;
217+ std::unordered_map<std::string, std:: shared_ptr<TH2>> mHistsPerRunMultVsCentZoom ;
218+ std::unordered_map<std::string, std:: shared_ptr<TH2>> mHistsPerRunNtracktVsCent ;
219+ std::unordered_map<std::string, std:: shared_ptr<TH2>> mHistsPerRunNtracktVsCentZoom ;
220+
221221 AxisSpec multAxis = {10000 , 0 , 10000 , " Multiplicity FT0M" };
222222 AxisSpec centAxis = {2021 , -0.025 , 101.025 , " Centrality" };
223223 AxisSpec centAxisZoom = {2000 , -0.0025 , 10.0025 , " Centrality" };
@@ -338,22 +338,21 @@ struct NonPromptCascadeTask {
338338 {
339339 // std::cout << "Filling mult histos" << std::endl;
340340 for (const auto & coll : collisions) {
341- if (!mRuns .count (mRunNumber )) {
342- std::string histName = " mult/hMultVsCent_run" + std::to_string (mRunNumber );
343- mHistPointer1 = std::get<std::shared_ptr<TH2>>(mRegistry .add (histName.c_str (), histName.c_str (), HistType::kTH2F , {centAxis, multAxis}));
344- histName = " mult/hMultVsCentZoom_run" + std::to_string (mRunNumber );
345- mHistPointer2 = std::get<std::shared_ptr<TH2>>(mRegistry .add (histName.c_str (), histName.c_str (), HistType::kTH2F , {centAxisZoom, multAxisZoom}));
346- histName = " mult/hNTracksVsCent_run" + std::to_string (mRunNumber );
347- mHistPointer3 = std::get<std::shared_ptr<TH2>>(mRegistry .add (histName.c_str (), histName.c_str (), HistType::kTH2F , {centAxis, nTracksAxis}));
348- histName = " mult/hNTracksVsCentZoom_run" + std::to_string (mRunNumber );
349- mHistPointer4 = std::get<std::shared_ptr<TH2>>(mRegistry .add (histName.c_str (), histName.c_str (), HistType::kTH2F , {centAxisZoom, nTracksAxis}));
350- mRuns .insert (mRunNumber );
341+ std::string histNameMvC = " mult/hMultVsCent_run" + std::to_string (mRunNumber );
342+ std::string histNameMvCZ = " mult/hMultVsCentZoom_run" + std::to_string (mRunNumber );
343+ std::string histNameTvC = " mult/hNTracksVsCent_run" + std::to_string (mRunNumber );
344+ std::string histNameTvCZ = " mult/hNTracksVsCentZoom_run" + std::to_string (mRunNumber );
345+ if (!mHistsPerRunMultVsCent .contains (histNameMvC)) {
346+ mHistsPerRunMultVsCent [histNameMvC] = std::get<std::shared_ptr<TH2>>(mRegistry .add (histNameMvC.c_str (), histNameMvC.c_str (), HistType::kTH2F , {centAxis, multAxis}));
347+ mHistsPerRunMultVsCentZoom [histNameMvCZ] = std::get<std::shared_ptr<TH2>>(mRegistry .add (histNameMvCZ.c_str (), histNameMvCZ.c_str (), HistType::kTH2F , {centAxisZoom, multAxisZoom}));
348+ mHistsPerRunNtracktVsCent [histNameTvC] = std::get<std::shared_ptr<TH2>>(mRegistry .add (histNameTvC.c_str (), histNameTvC.c_str (), HistType::kTH2F , {centAxis, nTracksAxis}));
349+ mHistsPerRunNtracktVsCentZoom [histNameTvCZ] = std::get<std::shared_ptr<TH2>>(mRegistry .add (histNameTvCZ.c_str (), histNameTvCZ.c_str (), HistType::kTH2F , {centAxisZoom, nTracksAxis}));
351350 }
352- mHistPointer1 ->Fill (coll.centFT0M (), coll.multFT0M ());
353- mHistPointer2 ->Fill (coll.centFT0M (), coll.multFT0M ());
354- mHistPointer3 ->Fill (coll.centFT0M (), coll.multNTracksGlobal ());
355- mHistPointer4 ->Fill (coll.centFT0M (), coll.multNTracksGlobal ());
356-
351+ mHistsPerRunMultVsCent [histNameMvC] ->Fill (coll.centFT0M (), coll.multFT0M ());
352+ mHistsPerRunMultVsCentZoom [histNameMvCZ] ->Fill (coll.centFT0M (), coll.multFT0M ());
353+ mHistsPerRunNtracktVsCent [histNameTvC] ->Fill (coll.centFT0M (), coll.multNTracksGlobal ());
354+ mHistsPerRunNtracktVsCentZoom [histNameTvCZ] ->Fill (coll.centFT0M (), coll.multNTracksGlobal ());
355+ // run integrated histos
357356 mRegistry .fill (HIST (" hMultVsCent" ), coll.centFT0M (), coll.multFT0M ());
358357 mRegistry .fill (HIST (" hMultVsCentZoom" ), coll.centFT0M (), coll.multFT0M ());
359358 mRegistry .fill (HIST (" hNTracksVsCent" ), coll.centFT0M (), (float )coll.multNTracksGlobal ());
0 commit comments