@@ -78,6 +78,12 @@ enum {
7878 kSpNotPrimary
7979};
8080
81+ enum {
82+ kNoGenpTVar = 0 ,
83+ kGenpTup ,
84+ kGenpTdown
85+ };
86+
8187struct Phik0shortanalysis {
8288 // Histograms are defined with HistogramRegistry
8389 HistogramRegistry dataEventHist{" dataEventHist" , {}, OutputObjHandlingPolicy::AnalysisObject, true , true };
@@ -346,7 +352,7 @@ struct Phik0shortanalysis {
346352 dataEventHist.add (" h2VertexZvsMult" , " Vertex Z vs Multiplicity Percentile" , kTH2F , {vertexZAxis, binnedmultAxis});
347353
348354 // Eta distribution for dN/deta values estimation in Data
349- dataEventHist.add (" h4EtaDistribution " , " Eta vs multiplicity in Data" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, {3 , -0 .5f , 2 .5f }});
355+ dataEventHist.add (" h5EtaDistribution " , " Eta vs multiplicity in Data" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, phiAxis , {3 , -0 .5f , 2 .5f }});
350356
351357 // Number of MC events per selection for Rec and Gen
352358 mcEventHist.add (" hRecMCEventSelection" , " hRecMCEventSelection" , kTH1F , {{9 , -0 .5f , 8 .5f }});
@@ -381,13 +387,13 @@ struct Phik0shortanalysis {
381387 mcEventHist.add (" h2GenMCRecoVertexZvsMult" , " GenMCReco Vertex Z vs Multiplicity Percentile" , kTH2F , {vertexZAxis, binnedmultAxis});
382388
383389 // Eta distribution for dN/deta values estimation in MC
384- mcEventHist.add (" h5RecoMCEtaDistribution " , " Eta vs multiplicity in MCReco" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, { 3 , -0 .5f , 2 .5f }, {6 , -0 .5f , 5 .5f }});
385- mcEventHist.add (" h5RecoCheckMCEtaDistribution " , " Eta vs multiplicity in MCReco Check" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, { 3 , -0 .5f , 2 .5f }, {6 , -0 .5f , 5 .5f }});
390+ mcEventHist.add (" h6RecoMCEtaDistribution " , " Eta vs multiplicity in MCReco" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, phiAxis, { 6 , -0 .5f , 5 .5f }, {3 , -0 .5f , 2 .5f }});
391+ mcEventHist.add (" h6RecoCheckMCEtaDistribution " , " Eta vs multiplicity in MCReco Check" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, phiAxis, { 6 , -0 .5f , 5 .5f }, {3 , -0 .5f , 2 .5f }});
386392
387393 mcEventHist.add (" h2GenMCEtaDistribution" , " Eta vs multiplicity in MCGen" , kTH2F , {binnedmultAxis, etaAxis});
388394 mcEventHist.add (" h2GenMCEtaDistributionAssocReco" , " Eta vs multiplicity in MCGen Assoc Reco" , kTH2F , {binnedmultAxis, etaAxis});
389- mcEventHist.add (" h4GenMCEtaDistributionReco " , " Eta vs multiplicity in MCGen Reco" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, {6 , -0 .5f , 5 .5f }});
390- mcEventHist.add (" h4GenMCEtaDistributionRecoCheck " , " Eta vs multiplicity in MCGen Reco Check" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, {6 , -0 .5f , 5 .5f }});
395+ mcEventHist.add (" h6GenMCEtaDistributionReco " , " Eta vs multiplicity in MCGen Reco" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, phiAxis, {6 , -0 .5f , 5 . 5f }, { 3 , - 0 . 5f , 2 .5f }});
396+ mcEventHist.add (" h6GenMCEtaDistributionRecoCheck " , " Eta vs multiplicity in MCGen Reco Check" , kTHnSparseF , {vertexZAxis, binnedmultAxis, etaAxis, phiAxis, {6 , -0 .5f , 5 . 5f }, { 3 , - 0 . 5f , 2 .5f }});
391397
392398 // Phi topological/PID cuts
393399 dataPhiHist.add (" h2DauTracksPhiDCAxyPreCutData" , " Dcaxy distribution vs pt before DCAxy cut" , kTH2F , {{100 , 0.0 , 5.0 , " #it{p}_{T} (GeV/#it{c})" }, {2000 , -0.05 , 0.05 , " DCA_{xy} (cm)" }});
@@ -2486,11 +2492,11 @@ struct Phik0shortanalysis {
24862492 dataEventHist.fill (HIST (" h2VertexZvsMult" ), collision.posZ (), collision.centFT0M ());
24872493
24882494 for (const auto & track : filteredTracks) {
2489- dataEventHist.fill (HIST (" h4EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), kGlobalplusITSonly );
2495+ dataEventHist.fill (HIST (" h5EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), track. phi (), kGlobalplusITSonly );
24902496 if (track.hasTPC ()) {
2491- dataEventHist.fill (HIST (" h4EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), kGlobalonly );
2497+ dataEventHist.fill (HIST (" h5EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), track. phi (), kGlobalonly );
24922498 } else {
2493- dataEventHist.fill (HIST (" h4EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), kITSonly );
2499+ dataEventHist.fill (HIST (" h5EtaDistribution " ), collision.posZ (), collision.centFT0M (), track.eta (), track. phi (), kITSonly );
24942500 }
24952501 }
24962502 }
@@ -2523,25 +2529,25 @@ struct Phik0shortanalysis {
25232529 if (!mcTrack.isPhysicalPrimary () || std::abs (mcTrack.eta ()) > trackConfigs.etaMax )
25242530 continue ;
25252531
2526- mcEventHist.fill (HIST (" h5RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalplusITSonly , kSpAll );
2532+ mcEventHist.fill (HIST (" h6RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kGlobalplusITSonly );
25272533 if (track.hasTPC ()) {
2528- mcEventHist.fill (HIST (" h5RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalonly , kSpAll );
2534+ mcEventHist.fill (HIST (" h6RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kGlobalonly );
25292535 } else {
2530- mcEventHist.fill (HIST (" h5RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kITSonly , kSpAll );
2536+ mcEventHist.fill (HIST (" h6RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kITSonly );
25312537 }
25322538
25332539 int pid = fromPDGToEnum (mcTrack.pdgCode ());
2534- mcEventHist.fill (HIST (" h5RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalplusITSonly , pid);
2540+ mcEventHist.fill (HIST (" h6RecoMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , pid, kGlobalplusITSonly );
25352541 }
25362542
25372543 for (const auto & mcParticle : mcParticlesThisColl) {
25382544 if (!isGenParticleCharged (mcParticle))
25392545 continue ;
25402546
2541- mcEventHist.fill (HIST (" h4GenMCEtaDistributionReco " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), kSpAll );
2547+ mcEventHist.fill (HIST (" h6GenMCEtaDistributionReco " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), mcParticle. phi (), kSpAll );
25422548
25432549 int pid = fromPDGToEnum (mcParticle.pdgCode ());
2544- mcEventHist.fill (HIST (" h4GenMCEtaDistributionReco " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), pid);
2550+ mcEventHist.fill (HIST (" h6GenMCEtaDistributionReco " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), mcParticle. phi (), pid);
25452551 }
25462552 }
25472553
@@ -2571,25 +2577,25 @@ struct Phik0shortanalysis {
25712577 if (!mcTrack.isPhysicalPrimary () || std::abs (mcTrack.eta ()) > trackConfigs.etaMax )
25722578 continue ;
25732579
2574- mcEventHist.fill (HIST (" h5RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalplusITSonly , kSpAll );
2580+ mcEventHist.fill (HIST (" h6RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kGlobalplusITSonly );
25752581 if (track.hasTPC ()) {
2576- mcEventHist.fill (HIST (" h5RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalonly , kSpAll );
2582+ mcEventHist.fill (HIST (" h6RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kGlobalonly );
25772583 } else {
2578- mcEventHist.fill (HIST (" h5RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kITSonly , kSpAll );
2584+ mcEventHist.fill (HIST (" h6RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , kSpAll , kITSonly );
25792585 }
25802586
25812587 int pid = fromPDGToEnum (mcTrack.pdgCode ());
2582- mcEventHist.fill (HIST (" h5RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), kGlobalplusITSonly , pid);
2588+ mcEventHist.fill (HIST (" h6RecoCheckMCEtaDistribution " ), collision.posZ (), mcCollision.centFT0M (), mcTrack.eta (), mcTrack. phi () , pid, kGlobalplusITSonly );
25832589 }
25842590
25852591 for (const auto & mcParticle : mcParticles) {
25862592 if (!isGenParticleCharged (mcParticle))
25872593 continue ;
25882594
2589- mcEventHist.fill (HIST (" h4GenMCEtaDistributionRecoCheck " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), kSpAll );
2595+ mcEventHist.fill (HIST (" h6GenMCEtaDistributionRecoCheck " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), mcParticle. phi (), kSpAll );
25902596
25912597 int pid = fromPDGToEnum (mcParticle.pdgCode ());
2592- mcEventHist.fill (HIST (" h4GenMCEtaDistributionRecoCheck " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), pid);
2598+ mcEventHist.fill (HIST (" h6GenMCEtaDistributionRecoCheck " ), collision.posZ (), mcCollision.centFT0M (), mcParticle.eta (), mcParticle. phi (), pid);
25932599 }
25942600
25952601 numberAssocColl++;
0 commit comments