@@ -214,7 +214,10 @@ struct CascadeAnalysisLightIonsDerivedData {
214214 // Multiplicity Histograms
215215 registryData.add (" hCentEstimator" , " hCentEstimator" , HistType::kTH1D , {{101 , 0 .0f , 101 .0f }});
216216 registryData.add (" hCentralityVsNch" , " hCentralityVsNch" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisNch});
217- registryData.add (" hCentralityVsMultiplicity" , " hCentralityVsMultiplicity" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisMult});
217+ if (centralityEstimator == Option::kNGlobal )
218+ registryData.add (" hCentralityVsMultiplicity" , " hCentralityVsMultiplicity" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisNch});
219+ else
220+ registryData.add (" hCentralityVsMultiplicity" , " hCentralityVsMultiplicity" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisMult});
218221
219222 // Histograms for xi (data)
220223 registryData.add (" hMassXipos" , " hMassXipos" , HistType::kTH3D , {centAxis, ptAxis, invMassXiAxis});
@@ -272,7 +275,10 @@ struct CascadeAnalysisLightIonsDerivedData {
272275 // Multiplicity Histograms
273276 registryMC.add (" hCentEstimator_truerec" , " hCentEstimator_truerec" , HistType::kTH1D , {{101 , 0 .0f , 101 .0f }});
274277 registryMC.add (" hCentralityVsNch_truerec" , " hCentralityVsNch_truerec" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisNch});
275- registryMC.add (" hCentralityVsMultiplicity_truerec" , " hCentralityVsMultiplicity_truerec" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisMult});
278+ if (centralityEstimator == Option::kNGlobal )
279+ registryMC.add (" hCentralityVsMultiplicity_truerec" , " hCentralityVsMultiplicity_truerec" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisNch});
280+ else
281+ registryMC.add (" hCentralityVsMultiplicity_truerec" , " hCentralityVsMultiplicity_truerec" , HistType::kTH2D , {{101 , 0 .0f , 101 .0f }, axisMult});
276282
277283 // Histograms for xi (mc)
278284 registryMC.add (" hMassXipos_truerec" , " hMassXipos_truerec" , HistType::kTH3D , {centAxis, ptAxis, invMassXiAxis});
@@ -643,14 +649,14 @@ struct CascadeAnalysisLightIonsDerivedData {
643649 void fillGeneratedEventProperties (TMCCollisions const & mcCollisions, TCollisions const & collisions)
644650 {
645651 std::vector<int > listBestCollisionIdx (mcCollisions.size ());
646- for (auto const & mcCollisions : mcCollisions) {
652+ for (auto const & mcCollision : mcCollisions) {
647653 // event selections
648- if (applyVtxZ && std::fabs (mcCollisions .posZ ()) > zVtx)
649- return ;
654+ if (applyVtxZ && std::fabs (mcCollision .posZ ()) > zVtx)
655+ continue ;
650656
651- registryMC.fill (HIST (" hGenEvents" ), mcCollisions .multMCNParticlesEta05 (), 0 /* all gen. events*/ );
657+ registryMC.fill (HIST (" hGenEvents" ), mcCollision .multMCNParticlesEta05 (), 0 /* all gen. events*/ );
652658
653- auto groupedCollisions = getGroupedCollisions (collisions, mcCollisions .globalIndex ());
659+ auto groupedCollisions = getGroupedCollisions (collisions, mcCollision .globalIndex ());
654660 // Check if there is at least one of the reconstructed collisions associated to this MC collision
655661 // If so, we consider it
656662 bool atLeastOne = false ;
@@ -711,12 +717,12 @@ struct CascadeAnalysisLightIonsDerivedData {
711717
712718 registryMC.fill (HIST (" hCentralityVsNcoll_beforeEvSel" ), centralitydata, groupedCollisions.size ());
713719 registryMC.fill (HIST (" hCentralityVsNcoll_afterEvSel" ), centralitydata, nCollisions);
714- registryMC.fill (HIST (" hCentralityVsMultMC" ), centralitydata, mcCollisions .multMCNParticlesEta05 ());
720+ registryMC.fill (HIST (" hCentralityVsMultMC" ), centralitydata, mcCollision .multMCNParticlesEta05 ());
715721
716- registryQC.fill (HIST (" hVertexZGen" ), mcCollisions .posZ ());
722+ registryQC.fill (HIST (" hVertexZGen" ), mcCollision .posZ ());
717723
718724 if (atLeastOne) {
719- registryMC.fill (HIST (" hGenEvents" ), mcCollisions .multMCNParticlesEta05 (), 1 /* at least 1 rec. event*/ );
725+ registryMC.fill (HIST (" hGenEvents" ), mcCollision .multMCNParticlesEta05 (), 1 /* at least 1 rec. event*/ );
720726
721727 registryMC.fill (HIST (" hGenEventCentrality" ), centralitydata);
722728 }
@@ -1056,7 +1062,7 @@ struct CascadeAnalysisLightIonsDerivedData {
10561062
10571063 // event selections
10581064 if (applyVtxZ && std::abs (mcCollision.posZ ()) > zVtx)
1059- return ;
1065+ continue ;
10601066
10611067 // Store the Zvtx
10621068 registryQC.fill (HIST (" hVertexZGen" ), mcCollision.posZ ());
0 commit comments