Skip to content

[PWGJE] Fix table descriptions to uppercase in slimTablesProducer #15918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nzardosh merged 2 commits into from
Apr 22, 2026
+20 −9
Merged

[PWGJE] Fix table descriptions to uppercase in slimTablesProducer #15918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f1bc2
UpperCase Index + histos
louisemillot Apr 22, 2026
1f531dd
histo check
louisemillot Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions PWGJE/TableProducer/slimTablesProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace slimcollision
{
DECLARE_SOA_COLUMN(Weight, weight, float);
}
DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions",
DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SLIMCOLLISION",
o2::soa::Index<>,
o2::aod::collision::PosZ,
o2::aod::collision::CollisionTime,
Expand All @@ -51,7 +51,7 @@ namespace slmccollision
{
DECLARE_SOA_COLUMN(McWeight, mcWeight, float);
}
DECLARE_SOA_TABLE(SlMcCollisions, "AOD", "SlMcCollisions",
DECLARE_SOA_TABLE(SlMcCollisions, "AOD", "SLMCCOLLISION",
o2::soa::Index<>,
o2::aod::mccollision::PosZ,
slmccollision::McWeight);
Expand All @@ -64,7 +64,7 @@ DECLARE_SOA_COLUMN(Py, py, float);
DECLARE_SOA_COLUMN(Pz, pz, float);
DECLARE_SOA_COLUMN(E, e, float);
} // namespace slimtracks
DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks",
DECLARE_SOA_TABLE(SlimTracks, "AOD", "SLIMTRACK",
o2::soa::Index<>,
slimtracks::SlimCollisionId,
slimtracks::Px,
Expand All @@ -79,7 +79,7 @@ DECLARE_SOA_COLUMN(Py, py, float);
DECLARE_SOA_COLUMN(Pz, pz, float);
DECLARE_SOA_COLUMN(E, e, float);
} // namespace slimparticles
DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles",
DECLARE_SOA_TABLE(SlimParticles, "AOD", "SLIMPARTICLE",
o2::soa::Index<>,
slimparticles::SlMcCollisionId,
slimparticles::Px,
Expand Down Expand Up @@ -129,13 +129,17 @@ struct SlimTablesProducer {
histos.add("h_mcCollMCD_counts_weight", "MC event status;event status;weighted entries", {HistType::kTH1F, {{5, 0.0, 5.0}}});
auto hMCD = histos.get<TH1>(HIST("h_mcCollMCD_counts_weight"));
hMCD->GetXaxis()->SetBinLabel(1, "All");
hMCD->GetXaxis()->SetBinLabel(2, "eventSelectionBits + skipMBGapEvents + applyRCTSelections ");
hMCD->GetXaxis()->SetBinLabel(2, "hasMcCollision");
hMCD->GetXaxis()->SetBinLabel(3, "selectCollision");

histos.add("h_mcCollMCP_counts_weight", "MC event status;event status;weighted entries", {HistType::kTH1F, {{7, 0.0, 7.0}}});
auto hMCP = histos.get<TH1>(HIST("h_mcCollMCP_counts_weight"));
hMCP->GetXaxis()->SetBinLabel(1, "All");
hMCP->GetXaxis()->SetBinLabel(2, "mcColl + skipMBGapEvents + applyRCTSelections");
hMCP->GetXaxis()->SetBinLabel(3, "Zvertex");
hMCP->GetXaxis()->SetBinLabel(2, "Zvertex");
hMCP->GetXaxis()->SetBinLabel(3, "selectMcCollision");

histos.add("Ntracks_pT", "track pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);
histos.add("Nparticles_pT", "particle pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);

eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
Expand Down Expand Up @@ -188,26 +192,32 @@ struct SlimTablesProducer {
return;
}
histos.fill(HIST("h_mcCollMCP_counts_weight"), 0.5, eventWeightMC);
if (std::abs(mccollision.posZ()) > vertexZCut)
histos.fill(HIST("h_mcCollMCP_counts_weight"), 1.5, eventWeightMC);
if (std::abs(mccollision.posZ()) > vertexZCut) {
return;
}
histos.fill(HIST("h_mcCollMCP_counts_weight"), 1.5, eventWeightMC);
if (!jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits, skipMBGapEvents, applyRCTSelections)) {
return;
}
histos.fill(HIST("h_mcCollMCP_counts_weight"), 2.5, eventWeightMC);
for (auto const& collision : collisions) {
float eventWeight = collision.weight();
histos.fill(HIST("h_mcCollMCD_counts_weight"), 0.5, eventWeightMC);
if (!collision.has_mcCollision()) {
continue;
}
histos.fill(HIST("h_mcCollMCD_counts_weight"), 1.5, eventWeightMC);
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections)) {
continue;
}
histos.fill(HIST("h_mcCollMCD_counts_weight"), 2.5, eventWeightMC);
slimCollisions(collision.posZ(), collision.collisionTime(), eventWeight);
auto slimCollIndex = slimCollisions.lastIndex();
auto slicedTracks = tracks.sliceBy(perCollisionTracks, collision.globalIndex()); // tracks associated to the rec collision
for (const auto& track : slicedTracks) {
if (!jetderiveddatautilities::selectTrack(track, trackSelection))
continue;
histos.fill(HIST("Ntracks_pT"), track.pt(), eventWeight);
slimTracks(slimCollIndex, track.px(), track.py(), track.pz());
}
slimMcCollisions(mccollision.posZ(), eventWeightMC);
Expand All @@ -220,6 +230,7 @@ struct SlimTablesProducer {
continue;
if (pdgParticle->Charge() == 0) // keep charged particles, exclude neutrals
continue;
histos.fill(HIST("Nparticles_pT"), particle.pt(), eventWeightMC);
slimParticles(slimMcCollIndex, particle.px(), particle.py(), particle.pz(), particle.energy());
}
}
Expand Down
Loading