@@ -1409,9 +1409,9 @@ struct HStrangeCorrelation {
14091409
14101410 // MC generated plots
14111411 if (doprocessMCGenerated) {
1412- histos.add (" Generated/hTrigger" , " " , kTH2F , {axesConfigurations.axisPtQA , axesConfigurations.axisEta });
1412+ histos.add (" Generated/hTrigger" , " " , kTH3F , {axesConfigurations.axisPtQA , axesConfigurations.axisEta , axesConfigurations. axisMult });
14131413 for (int i = 0 ; i < 9 ; i++) {
1414- histos.add (fmt::format (" Generated/h{}" , kParticlenames [i]).c_str (), " " , kTH2F , {axesConfigurations.axisPtQA , axesConfigurations.axisEta });
1414+ histos.add (fmt::format (" Generated/h{}" , kParticlenames [i]).c_str (), " " , kTH3F , {axesConfigurations.axisPtQA , axesConfigurations.axisEta , axesConfigurations. axisMult });
14151415 }
14161416 histos.addClone (" Generated/" , " GeneratedWithPV/" );
14171417
@@ -1690,7 +1690,7 @@ struct HStrangeCorrelation {
16901690 efficiency = 1 ;
16911691 }
16921692 float weight = efficiencyFlags.applyEfficiencyCorrection ? purity / efficiency : 1 .0f ;
1693- histos.fill (HIST (" hAssocHadronsAllSelectedEtaVsPt" ), assoc.pt (), assoc.eta (), collision.centFT0M ());
1693+ histos.fill (HIST (" hAssocHadronsAllSelectedEtaVsPt" ), assoc.pt (), assoc.eta (), collision.centFT0M (), weight );
16941694 histos.fill (HIST (" hAssocPtResolution" ), assoc.pt (), assocTrack.mcOriginalPt ());
16951695 if (doAssocPhysicalPrimary && !assocTrack.mcPhysicalPrimary ())
16961696 continue ;
@@ -2172,10 +2172,10 @@ struct HStrangeCorrelation {
21722172 constexpr int Index = i.value ;
21732173 if (i == 0 || i == 7 ) {
21742174 if (std::abs (mcParticle.pdgCode ()) == kPdgCodes [i])
2175- histos.fill (HIST (" Generated/h" ) + HIST (kParticlenames [Index]), mcParticle.pt (), mcParticle.eta ());
2175+ histos.fill (HIST (" Generated/h" ) + HIST (kParticlenames [Index]), mcParticle.pt (), mcParticle.eta (), 1 );
21762176 } else {
21772177 if (mcParticle.pdgCode () == kPdgCodes [i])
2178- histos.fill (HIST (" Generated/h" ) + HIST (kParticlenames [Index]), mcParticle.pt (), mcParticle.eta ());
2178+ histos.fill (HIST (" Generated/h" ) + HIST (kParticlenames [Index]), mcParticle.pt (), mcParticle.eta (), 1 );
21792179 }
21802180 });
21812181 }
@@ -2265,7 +2265,7 @@ struct HStrangeCorrelation {
22652265 double geta = mcParticle.eta ();
22662266 double gpt = mcParticle.pt ();
22672267 if (std::abs (mcParticle.pdgCode ()) == PDG_t::kPiPlus || std::abs (mcParticle.pdgCode ()) == PDG_t::kKPlus || std::abs (mcParticle.pdgCode ()) == PDG_t::kProton || std::abs (mcParticle.pdgCode ()) == PDG_t::kElectron || std::abs (mcParticle.pdgCode ()) == PDG_t::kMuonMinus )
2268- histos.fill (HIST (" GeneratedWithPV/hTrigger" ), gpt, geta);
2268+ histos.fill (HIST (" GeneratedWithPV/hTrigger" ), gpt, geta, bestCollisionFT0Mpercentile );
22692269 if (mcParticle.pdgCode () == PDG_t::kLambda0 && !doAssocPhysicalPrimaryInGen && !mcParticle.isPhysicalPrimary ()) {
22702270 if (std::abs (geta) > etaSel) {
22712271 continue ;
@@ -2311,14 +2311,14 @@ struct HStrangeCorrelation {
23112311 constexpr int Index = i.value ;
23122312 if (i == 0 || i == 7 ) {
23132313 if (std::abs (mcParticle.pdgCode ()) == kPdgCodes [i]) {
2314- histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]), gpt, geta);
2314+ histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]), gpt, geta, bestCollisionFT0Mpercentile );
23152315 if (std::abs (mcParticle.y ()) < ySel)
23162316 histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]) + HIST (" _MidYVsMult" ), gpt, bestCollisionFT0Mpercentile);
23172317 }
23182318
23192319 } else {
23202320 if (mcParticle.pdgCode () == kPdgCodes [i]) {
2321- histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]), gpt, geta);
2321+ histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]), gpt, geta, bestCollisionFT0Mpercentile );
23222322 if (std::abs (mcParticle.y ()) < ySel)
23232323 histos.fill (HIST (" GeneratedWithPV/h" ) + HIST (kParticlenames [Index]) + HIST (" _MidYVsMult" ), gpt, bestCollisionFT0Mpercentile);
23242324 }
@@ -2432,7 +2432,9 @@ struct HStrangeCorrelation {
24322432 if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary ()) {
24332433 triggerIndices.emplace_back (iteratorNum);
24342434 histos.fill (HIST (" ClosureTest/hTrigger" ), gpt, geta, bestCollisionFT0Mpercentile);
2435- if (doCorrelationHadron) {
2435+ }
2436+ if (doCorrelationHadron) {
2437+ if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary ()) {
24362438 assocHadronIndices.emplace_back (iteratorNum);
24372439 histos.fill (HIST (" ClosureTest/hHadron" ), gpt, geta, gphi);
24382440 }
0 commit comments