Skip to content

Commit d9e2aa6

Browse files
authored
[PWGJE] Fix table descriptions to uppercase in slimTablesProducer (#15918)
1 parent 1cb2c78 commit d9e2aa6

1 file changed

Lines changed: 20 additions & 9 deletions

File tree

PWGJE/TableProducer/slimTablesProducer.cxx

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace slimcollision
4141
{
4242
DECLARE_SOA_COLUMN(Weight, weight, float);
4343
}
44-
DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SlimCollisions",
44+
DECLARE_SOA_TABLE(SlimCollisions, "AOD", "SLIMCOLLISION",
4545
o2::soa::Index<>,
4646
o2::aod::collision::PosZ,
4747
o2::aod::collision::CollisionTime,
@@ -51,7 +51,7 @@ namespace slmccollision
5151
{
5252
DECLARE_SOA_COLUMN(McWeight, mcWeight, float);
5353
}
54-
DECLARE_SOA_TABLE(SlMcCollisions, "AOD", "SlMcCollisions",
54+
DECLARE_SOA_TABLE(SlMcCollisions, "AOD", "SLMCCOLLISION",
5555
o2::soa::Index<>,
5656
o2::aod::mccollision::PosZ,
5757
slmccollision::McWeight);
@@ -64,7 +64,7 @@ DECLARE_SOA_COLUMN(Py, py, float);
6464
DECLARE_SOA_COLUMN(Pz, pz, float);
6565
DECLARE_SOA_COLUMN(E, e, float);
6666
} // namespace slimtracks
67-
DECLARE_SOA_TABLE(SlimTracks, "AOD", "SlimTracks",
67+
DECLARE_SOA_TABLE(SlimTracks, "AOD", "SLIMTRACK",
6868
o2::soa::Index<>,
6969
slimtracks::SlimCollisionId,
7070
slimtracks::Px,
@@ -79,7 +79,7 @@ DECLARE_SOA_COLUMN(Py, py, float);
7979
DECLARE_SOA_COLUMN(Pz, pz, float);
8080
DECLARE_SOA_COLUMN(E, e, float);
8181
} // namespace slimparticles
82-
DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles",
82+
DECLARE_SOA_TABLE(SlimParticles, "AOD", "SLIMPARTICLE",
8383
o2::soa::Index<>,
8484
slimparticles::SlMcCollisionId,
8585
slimparticles::Px,
@@ -129,13 +129,17 @@ struct SlimTablesProducer {
129129
histos.add("h_mcCollMCD_counts_weight", "MC event status;event status;weighted entries", {HistType::kTH1F, {{5, 0.0, 5.0}}});
130130
auto hMCD = histos.get<TH1>(HIST("h_mcCollMCD_counts_weight"));
131131
hMCD->GetXaxis()->SetBinLabel(1, "All");
132-
hMCD->GetXaxis()->SetBinLabel(2, "eventSelectionBits + skipMBGapEvents + applyRCTSelections ");
132+
hMCD->GetXaxis()->SetBinLabel(2, "hasMcCollision");
133+
hMCD->GetXaxis()->SetBinLabel(3, "selectCollision");
133134

134135
histos.add("h_mcCollMCP_counts_weight", "MC event status;event status;weighted entries", {HistType::kTH1F, {{7, 0.0, 7.0}}});
135136
auto hMCP = histos.get<TH1>(HIST("h_mcCollMCP_counts_weight"));
136137
hMCP->GetXaxis()->SetBinLabel(1, "All");
137-
hMCP->GetXaxis()->SetBinLabel(2, "mcColl + skipMBGapEvents + applyRCTSelections");
138-
hMCP->GetXaxis()->SetBinLabel(3, "Zvertex");
138+
hMCP->GetXaxis()->SetBinLabel(2, "Zvertex");
139+
hMCP->GetXaxis()->SetBinLabel(3, "selectMcCollision");
140+
141+
histos.add("Ntracks_pT", "track pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);
142+
histos.add("Nparticles_pT", "particle pT distribution;#it{p}_{T} (GeV/#it{c});entries", {HistType::kTH1F, {{200, -0.5, 199.5}}}, doSumw2);
139143

140144
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(eventSelections));
141145
trackSelection = jetderiveddatautilities::initialiseTrackSelection(static_cast<std::string>(trackSelections));
@@ -188,26 +192,32 @@ struct SlimTablesProducer {
188192
return;
189193
}
190194
histos.fill(HIST("h_mcCollMCP_counts_weight"), 0.5, eventWeightMC);
191-
if (std::abs(mccollision.posZ()) > vertexZCut)
192-
histos.fill(HIST("h_mcCollMCP_counts_weight"), 1.5, eventWeightMC);
195+
if (std::abs(mccollision.posZ()) > vertexZCut) {
196+
return;
197+
}
198+
histos.fill(HIST("h_mcCollMCP_counts_weight"), 1.5, eventWeightMC);
193199
if (!jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits, skipMBGapEvents, applyRCTSelections)) {
194200
return;
195201
}
196202
histos.fill(HIST("h_mcCollMCP_counts_weight"), 2.5, eventWeightMC);
197203
for (auto const& collision : collisions) {
198204
float eventWeight = collision.weight();
205+
histos.fill(HIST("h_mcCollMCD_counts_weight"), 0.5, eventWeightMC);
199206
if (!collision.has_mcCollision()) {
200207
continue;
201208
}
209+
histos.fill(HIST("h_mcCollMCD_counts_weight"), 1.5, eventWeightMC);
202210
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents, applyRCTSelections)) {
203211
continue;
204212
}
213+
histos.fill(HIST("h_mcCollMCD_counts_weight"), 2.5, eventWeightMC);
205214
slimCollisions(collision.posZ(), collision.collisionTime(), eventWeight);
206215
auto slimCollIndex = slimCollisions.lastIndex();
207216
auto slicedTracks = tracks.sliceBy(perCollisionTracks, collision.globalIndex()); // tracks associated to the rec collision
208217
for (const auto& track : slicedTracks) {
209218
if (!jetderiveddatautilities::selectTrack(track, trackSelection))
210219
continue;
220+
histos.fill(HIST("Ntracks_pT"), track.pt(), eventWeight);
211221
slimTracks(slimCollIndex, track.px(), track.py(), track.pz());
212222
}
213223
slimMcCollisions(mccollision.posZ(), eventWeightMC);
@@ -220,6 +230,7 @@ struct SlimTablesProducer {
220230
continue;
221231
if (pdgParticle->Charge() == 0) // keep charged particles, exclude neutrals
222232
continue;
233+
histos.fill(HIST("Nparticles_pT"), particle.pt(), eventWeightMC);
223234
slimParticles(slimMcCollIndex, particle.px(), particle.py(), particle.pz(), particle.energy());
224235
}
225236
}

0 commit comments

Comments
 (0)