Skip to content

Commit c1f9c1c

Browse files
joachimckhjoachimckh
committed
fix gen issues
1 parent f0078b6 commit c1f9c1c

File tree

1 file changed

+30
-23
lines changed

1 file changed

+30
-23
lines changed

‎PWGJE/Tasks/jetSpectraEseTask.cxx‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ struct JetSpectraEseTask {
149149
Preslice<ChargedMCDJets> mcdjetsPerJCollision = o2::aod::jet::collisionId;
150150
Preslice<aod::JetTracks> tracksPerJCollision = o2::aod::jtrack::collisionId;
151151
Preslice<aod::JetTracksMCD> mcdTracksPerJCollision = o2::aod::jtrack::collisionId;
152-
Preslice<aod::JetParticles> particlesPerJMcCollision = o2::aod::jmcparticle::mcCollisionId;
153152

154153
SliceCache cache;
155154
using BinningType = ColumnBinningPolicy<aod::jcollision::PosZ, aod::jcollision::CentFT0C>;
@@ -345,6 +344,8 @@ struct JetSpectraEseTask {
345344
registry.get<TH1>(HIST("mcp/hEventCounter"))->GetXaxis()->SetBinLabel(2, "Collision size < 1");
346345
registry.get<TH1>(HIST("mcp/hEventCounter"))->GetXaxis()->SetBinLabel(3, "MCD size != 1");
347346
registry.get<TH1>(HIST("mcp/hEventCounter"))->GetXaxis()->SetBinLabel(4, "Occupancy cut");
347+
registry.get<TH1>(HIST("mcp/hEventCounter"))->GetXaxis()->SetBinLabel(5, "Vtx z cut");
348+
registry.get<TH1>(HIST("mcp/hEventCounter"))->GetXaxis()->SetBinLabel(6, "Event selection");
348349
}
349350
if (doprocessMCDetectorLevel) {
350351
LOGF(info, "JetSpectraEseTask::init() - MC Detector level");
@@ -357,8 +358,9 @@ struct JetSpectraEseTask {
357358
// registry.add("mcd/hJetPhi", "particle level jet #phi;#phi_{jet part};entries", {HistType::kTH1F, {{phiAxis}}});
358359

359360
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(1, "Input event");
360-
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(2, "Collision size < 1");
361-
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(3, "Occupancy cut");
361+
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(1, "Event selection");
362+
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(2, "Occupancy cut");
363+
registry.get<TH1>(HIST("mcd/hEventCounter"))->GetXaxis()->SetBinLabel(3, "Vtx z cut");
362364
}
363365
if (doprocessMCChargedMatched) {
364366
LOGF(info, "JetSpectraEseTask::init() - MC Charged Matched");
@@ -402,19 +404,20 @@ struct JetSpectraEseTask {
402404
}
403405
if (doprocessMCGenTrack) {
404406
LOGF(info, "JetSpectraEseTask::init() - MCGen track");
405-
registry.add("hTrackPtGen", "", {HistType::kTH1F, {{assocTrackPt}}});
406-
registry.add("hTrackEtaGen", "", {HistType::kTH1F, {{etaAxis}}});
407-
registry.add("hTrackPhiGen", "", {HistType::kTH1F, {{phiAxis}}});
407+
registry.add("mcgen/hTrackPtGen", "", {HistType::kTH1F, {{assocTrackPt}}});
408+
registry.add("mcgen/hTrackEtaGen", "", {HistType::kTH1F, {{etaAxis}}});
409+
registry.add("mcgen/hTrackPhiGen", "", {HistType::kTH1F, {{phiAxis}}});
408410
}
409411
if (doprocessMCRecoTrack) {
410412
LOGF(info, "JetSpectraEseTask::init() - MCRec track");
411-
registry.add("hTrackPtReco", "", {HistType::kTH1F, {{assocTrackPt}}});
412-
registry.add("hTrackEtaReco", "", {HistType::kTH1F, {{etaAxis}}});
413-
registry.add("hTrackPhiReco", "", {HistType::kTH1F, {{phiAxis}}});
413+
registry.add("mcrec/hTrackPtReco", "", {HistType::kTH1F, {{assocTrackPt}}});
414+
registry.add("mcrec/hTrackEtaReco", "", {HistType::kTH1F, {{etaAxis}}});
415+
registry.add("mcrec/hTrackPhiReco", "", {HistType::kTH1F, {{phiAxis}}});
414416
}
415417
}
416418

417-
void loadEfficiency(aod::BCsWithTimestamps::iterator const& bc)
419+
template <typename TBC>
420+
void loadEfficiency(TBC const& bc)
418421
{
419422
uint64_t timestamp = bc.timestamp();
420423
if (cfg.isLoaded) {
@@ -549,7 +552,7 @@ struct JetSpectraEseTask {
549552
Pair<TCollisions, TJets, TTracks, BinningType> pairData{corrBinning, numberEventsMixed, -1, collisions, tracksTuple, &cache};
550553

551554
for (const auto& [c1, jets1, c2, tracks2] : pairData) {
552-
auto bc = c2.template bc_as<aod::BCsWithTimestamps>();
555+
auto bc = c2.template bc_as<aod::JBCs>();
553556
loadEfficiency(bc);
554557
auto c1Tracks = tracks.sliceBy(tracksPerJCollision, c1.globalIndex());
555558
registry.fill(HIST("eventQA/before/hVtxZMixed"), c1.posZ());
@@ -640,7 +643,7 @@ struct JetSpectraEseTask {
640643

641644
void processESEDataCharged(soa::Join<aod::JetCollisions, aod::BkgChargedRhos, aod::Qvectors, aod::QPercentileFT0Cs>::iterator const& collision,
642645
soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>> const& jets,
643-
aod::JetTracks const& tracks, aod::BCsWithTimestamps const&)
646+
aod::JetTracks const& tracks, aod::JBCs const&)
644647
{
645648
registry.fill(HIST("eventQA/hEventCounter"), kFilteredInputEv);
646649
registry.fill(HIST("eventQA/before/hVtxZ"), collision.posZ());
@@ -652,15 +655,15 @@ struct JetSpectraEseTask {
652655
return;
653656
registry.fill(HIST("eventQA/hEventCounter"), kOccupancyCut);
654657

655-
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
658+
auto bc = collision.bc_as<aod::JBCs>();
656659
loadEfficiency(bc);
657660
jetSpectra(collision, jets, tracks);
658661
}
659662
PROCESS_SWITCH(JetSpectraEseTask, processESEDataCharged, "process ese collisions", true);
660663

661664
void processESEDataChargedMixed(soa::Join<aod::JetCollisions, aod::BkgChargedRhos, aod::Qvectors, aod::QPercentileFT0Cs> const& collisions,
662665
soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>> const& jets,
663-
aod::JetTracks const& tracks, aod::BCsWithTimestamps const&)
666+
aod::JetTracks const& tracks, aod::JBCs const&)
664667
{
665668
jetMixed(collisions, jets, tracks);
666669
}
@@ -747,12 +750,13 @@ struct JetSpectraEseTask {
747750
}
748751
if (cfgEvSelOccupancy && !fOccupancy)
749752
return;
753+
registry.fill(HIST("mcp/hEventCounter"), counter++);
750754
if (!(std::abs(mcCollision.posZ()) < vertexZCut)) {
751755
return;
752756
}
757+
registry.fill(HIST("mcp/hEventCounter"), counter++);
753758
if (!eventSel)
754759
return;
755-
756760
registry.fill(HIST("mcp/hEventCounter"), counter++);
757761

758762
registry.fill(HIST("mcp/hCentralitySel"), centrality);
@@ -777,6 +781,7 @@ struct JetSpectraEseTask {
777781
if (!(std::abs(collision.posZ()) < vertexZCut)) {
778782
return;
779783
}
784+
registry.fill(HIST("mcd/hEventCounter"), counter++);
780785

781786
auto centrality = cfgisPbPb ? collision.centFT0M() : -1;
782787

@@ -875,8 +880,10 @@ struct JetSpectraEseTask {
875880
return;
876881
}
877882

878-
auto particlesInCollision = particles.sliceBy(particlesPerJMcCollision, mcCollision.globalIndex());
879-
for (const auto& particle : particlesInCollision) {
883+
for (const auto& particle : particles) {
884+
if (particle.mcCollisionId() != mcCollision.globalIndex()) {
885+
continue;
886+
}
880887
if (!isChargedParticle(particle.pdgCode())) {
881888
continue;
882889
}
@@ -890,9 +897,9 @@ struct JetSpectraEseTask {
890897
continue;
891898
}
892899

893-
registry.fill(HIST("hTrackPtGen"), particle.pt());
894-
registry.fill(HIST("hTrackEtaGen"), particle.eta());
895-
registry.fill(HIST("hTrackPhiGen"), particle.phi());
900+
registry.fill(HIST("mcgen/hTrackPtGen"), particle.pt());
901+
registry.fill(HIST("mcgen/hTrackEtaGen"), particle.eta());
902+
registry.fill(HIST("mcgen/hTrackPhiGen"), particle.phi());
896903
}
897904
}
898905
PROCESS_SWITCH(JetSpectraEseTask, processMCGenTrack, "jet MC process: Generated track", false);
@@ -955,9 +962,9 @@ struct JetSpectraEseTask {
955962
}
956963
seenMcParticles.push_back(particle.globalIndex());
957964

958-
registry.fill(HIST("hTrackPtReco"), track.pt());
959-
registry.fill(HIST("hTrackEtaReco"), track.eta());
960-
registry.fill(HIST("hTrackPhiReco"), track.phi());
965+
registry.fill(HIST("mcrec/hTrackPtReco"), track.pt());
966+
registry.fill(HIST("mcrec/hTrackEtaReco"), track.eta());
967+
registry.fill(HIST("mcrec/hTrackPhiReco"), track.phi());
961968
}
962969
}
963970
}

0 commit comments

Comments
 (0)