Skip to content

[PWGJE] Fix event weight and add counts #14321

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 3 commits into from
Dec 23, 2025
+27 −3
Merged

[PWGJE] Fix event weight and add counts #14321

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d31acf0
fix weight and add event counts
hanseopark Dec 22, 2025
4cba9b9
fix complicit
hanseopark Dec 22, 2025
cd0d4d0
Merge branch 'master' into HFTagging
hanseopark Dec 22, 2025
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
30 changes: 27 additions & 3 deletions PWGJE/Tasks/jetTaggerHFQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ struct JetTaggerHFQA {
AxisSpec axisFracSecPt = {100, 0, 1, "#frac{#Sigma#it{p}_{T}^{secondary track}}{#it{p}_{T, jet}}"};
AxisSpec axisMultScaledFT0M = {binMultScaledFT0M, "Multiplicity classes"};

registry.add("h_collision_events", "data;mcd;mcp evnets", {HistType::kTH1F, {{4, 0.0, 4.0}}});
if (doprocessTracksDca) {
if (fillIPxy) {
registry.add("h_impact_parameter_xy", "", {HistType::kTH1F, {{axisImpactParameterXY}}});
Expand Down Expand Up @@ -1444,9 +1445,9 @@ struct JetTaggerHFQA {
continue;
}
auto jetflavour = mcdjet.origin();
registry.fill(HIST("h2_jet_pt_flavour"), mcdjet.pt(), jetflavour);
registry.fill(HIST("h2_jet_eta_flavour"), mcdjet.eta(), jetflavour);
registry.fill(HIST("h2_jet_phi_flavour"), mcdjet.phi(), jetflavour);
registry.fill(HIST("h2_jet_pt_flavour"), mcdjet.pt(), jetflavour, eventWeight);
registry.fill(HIST("h2_jet_eta_flavour"), mcdjet.eta(), jetflavour, eventWeight);
registry.fill(HIST("h2_jet_phi_flavour"), mcdjet.phi(), jetflavour, eventWeight);
if (!mcdjet.has_matchedJetGeo())
continue;
for (auto const& mcpjet : mcdjet.template matchedJetGeo_as<soa::Join<JetTableMCP, JetTableMCPMCD>>()) {
Expand All @@ -1461,6 +1462,7 @@ struct JetTaggerHFQA {

void processMCP(JetTableMCP const& mcpjets, aod::JetParticles const&, soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Filtered<aod::JetCollisionsMCD> const& collisions)
{
registry.fill(HIST("h_collision_events"), 2.5); // mcp events
for (auto const& mcpjet : mcpjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcpjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1483,6 +1485,7 @@ struct JetTaggerHFQA {

void processMCPWeighted(JetTableMCP const& mcpjets, aod::JetParticles const&, soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs> const& mcCollisions, soa::Filtered<soa::Join<aod::JetCollisionsMCD, aod::JCollisionOutliers>> const& collisions)
{
registry.fill(HIST("h_collision_events"), 2.5); // mcp events
for (auto const& mcpjet : mcpjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcpjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand Down Expand Up @@ -1510,6 +1513,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 0.5); // data events
for (auto const& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1527,6 +1531,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1544,6 +1549,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1558,6 +1564,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
auto const particlesPerColl = particles.sliceBy(particlesPerCollision, collision.mcCollisionId());
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
Expand All @@ -1582,6 +1589,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
auto const particlesPerColl = particles.sliceBy(particlesPerCollision, collision.mcCollisionId());
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
Expand All @@ -1607,6 +1615,8 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
if (!doprocessIPsData)
registry.fill(HIST("h_collision_events"), 0.5); // data events
for (auto const& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1624,6 +1634,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1644,6 +1655,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1661,6 +1673,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1684,6 +1697,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1704,6 +1718,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 0.5); // mcd events
for (auto const& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1721,6 +1736,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 0.5); // mcd events
for (auto const& jet : jets) {
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand Down Expand Up @@ -1759,6 +1775,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1779,6 +1796,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1796,6 +1814,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1820,6 +1839,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1841,6 +1861,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1861,6 +1882,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1878,6 +1900,7 @@ struct JetTaggerHFQA {
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand All @@ -1902,6 +1925,7 @@ struct JetTaggerHFQA {
if (collision.isOutlier()) {
return;
}
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
for (auto const& mcdjet : mcdjets) {
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
continue;
Expand Down
Loading