Skip to content

Commit 7b99e06

Browse files
authored
[PWGJE] Fix event weight and add counts (#14321)
1 parent a71be96 commit 7b99e06

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

PWGJE/Tasks/jetTaggerHFQA.cxx

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ struct JetTaggerHFQA {
153153
AxisSpec axisFracSecPt = {100, 0, 1, "#frac{#Sigma#it{p}_{T}^{secondary track}}{#it{p}_{T, jet}}"};
154154
AxisSpec axisMultScaledFT0M = {binMultScaledFT0M, "Multiplicity classes"};
155155

156+
registry.add("h_collision_events", "data;mcd;mcp evnets", {HistType::kTH1F, {{4, 0.0, 4.0}}});
156157
if (doprocessTracksDca) {
157158
if (fillIPxy) {
158159
registry.add("h_impact_parameter_xy", "", {HistType::kTH1F, {{axisImpactParameterXY}}});
@@ -1444,9 +1445,9 @@ struct JetTaggerHFQA {
14441445
continue;
14451446
}
14461447
auto jetflavour = mcdjet.origin();
1447-
registry.fill(HIST("h2_jet_pt_flavour"), mcdjet.pt(), jetflavour);
1448-
registry.fill(HIST("h2_jet_eta_flavour"), mcdjet.eta(), jetflavour);
1449-
registry.fill(HIST("h2_jet_phi_flavour"), mcdjet.phi(), jetflavour);
1448+
registry.fill(HIST("h2_jet_pt_flavour"), mcdjet.pt(), jetflavour, eventWeight);
1449+
registry.fill(HIST("h2_jet_eta_flavour"), mcdjet.eta(), jetflavour, eventWeight);
1450+
registry.fill(HIST("h2_jet_phi_flavour"), mcdjet.phi(), jetflavour, eventWeight);
14501451
if (!mcdjet.has_matchedJetGeo())
14511452
continue;
14521453
for (auto const& mcpjet : mcdjet.template matchedJetGeo_as<soa::Join<JetTableMCP, JetTableMCPMCD>>()) {
@@ -1461,6 +1462,7 @@ struct JetTaggerHFQA {
14611462

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

14841486
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)
14851487
{
1488+
registry.fill(HIST("h_collision_events"), 2.5); // mcp events
14861489
for (auto const& mcpjet : mcpjets) {
14871490
if (!jetfindingutilities::isInEtaAcceptance(mcpjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
14881491
continue;
@@ -1510,6 +1513,7 @@ struct JetTaggerHFQA {
15101513
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
15111514
return;
15121515
}
1516+
registry.fill(HIST("h_collision_events"), 0.5); // data events
15131517
for (auto const& jet : jets) {
15141518
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
15151519
continue;
@@ -1527,6 +1531,7 @@ struct JetTaggerHFQA {
15271531
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
15281532
return;
15291533
}
1534+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
15301535
for (auto const& mcdjet : mcdjets) {
15311536
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
15321537
continue;
@@ -1544,6 +1549,7 @@ struct JetTaggerHFQA {
15441549
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
15451550
return;
15461551
}
1552+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
15471553
for (auto const& mcdjet : mcdjets) {
15481554
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
15491555
continue;
@@ -1558,6 +1564,7 @@ struct JetTaggerHFQA {
15581564
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
15591565
return;
15601566
}
1567+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
15611568
for (auto const& mcdjet : mcdjets) {
15621569
auto const particlesPerColl = particles.sliceBy(particlesPerCollision, collision.mcCollisionId());
15631570
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
@@ -1582,6 +1589,7 @@ struct JetTaggerHFQA {
15821589
if (collision.isOutlier()) {
15831590
return;
15841591
}
1592+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
15851593
for (auto const& mcdjet : mcdjets) {
15861594
auto const particlesPerColl = particles.sliceBy(particlesPerCollision, collision.mcCollisionId());
15871595
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
@@ -1607,6 +1615,8 @@ struct JetTaggerHFQA {
16071615
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
16081616
return;
16091617
}
1618+
if (!doprocessIPsData)
1619+
registry.fill(HIST("h_collision_events"), 0.5); // data events
16101620
for (auto const& jet : jets) {
16111621
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
16121622
continue;
@@ -1624,6 +1634,7 @@ struct JetTaggerHFQA {
16241634
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
16251635
return;
16261636
}
1637+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
16271638
for (auto const& mcdjet : mcdjets) {
16281639
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
16291640
continue;
@@ -1644,6 +1655,7 @@ struct JetTaggerHFQA {
16441655
if (collision.isOutlier()) {
16451656
return;
16461657
}
1658+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
16471659
for (auto const& mcdjet : mcdjets) {
16481660
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
16491661
continue;
@@ -1661,6 +1673,7 @@ struct JetTaggerHFQA {
16611673
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
16621674
return;
16631675
}
1676+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
16641677
for (auto const& mcdjet : mcdjets) {
16651678
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
16661679
continue;
@@ -1684,6 +1697,7 @@ struct JetTaggerHFQA {
16841697
if (collision.isOutlier()) {
16851698
return;
16861699
}
1700+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
16871701
for (auto const& mcdjet : mcdjets) {
16881702
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
16891703
continue;
@@ -1704,6 +1718,7 @@ struct JetTaggerHFQA {
17041718
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
17051719
return;
17061720
}
1721+
registry.fill(HIST("h_collision_events"), 0.5); // mcd events
17071722
for (auto const& jet : jets) {
17081723
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
17091724
continue;
@@ -1721,6 +1736,7 @@ struct JetTaggerHFQA {
17211736
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
17221737
return;
17231738
}
1739+
registry.fill(HIST("h_collision_events"), 0.5); // mcd events
17241740
for (auto const& jet : jets) {
17251741
if (!jetfindingutilities::isInEtaAcceptance(jet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
17261742
continue;
@@ -1759,6 +1775,7 @@ struct JetTaggerHFQA {
17591775
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
17601776
return;
17611777
}
1778+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
17621779
for (auto const& mcdjet : mcdjets) {
17631780
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
17641781
continue;
@@ -1779,6 +1796,7 @@ struct JetTaggerHFQA {
17791796
if (collision.isOutlier()) {
17801797
return;
17811798
}
1799+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
17821800
for (auto const& mcdjet : mcdjets) {
17831801
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
17841802
continue;
@@ -1796,6 +1814,7 @@ struct JetTaggerHFQA {
17961814
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
17971815
return;
17981816
}
1817+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
17991818
for (auto const& mcdjet : mcdjets) {
18001819
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
18011820
continue;
@@ -1820,6 +1839,7 @@ struct JetTaggerHFQA {
18201839
if (collision.isOutlier()) {
18211840
return;
18221841
}
1842+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
18231843
for (auto const& mcdjet : mcdjets) {
18241844
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
18251845
continue;
@@ -1841,6 +1861,7 @@ struct JetTaggerHFQA {
18411861
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
18421862
return;
18431863
}
1864+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
18441865
for (auto const& mcdjet : mcdjets) {
18451866
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
18461867
continue;
@@ -1861,6 +1882,7 @@ struct JetTaggerHFQA {
18611882
if (collision.isOutlier()) {
18621883
return;
18631884
}
1885+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
18641886
for (auto const& mcdjet : mcdjets) {
18651887
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
18661888
continue;
@@ -1878,6 +1900,7 @@ struct JetTaggerHFQA {
18781900
if (collision.trackOccupancyInTimeRange() < trackOccupancyInTimeRangeMin || trackOccupancyInTimeRangeMax < collision.trackOccupancyInTimeRange()) {
18791901
return;
18801902
}
1903+
registry.fill(HIST("h_collision_events"), 1.5); // mcd events
18811904
for (auto const& mcdjet : mcdjets) {
18821905
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
18831906
continue;
@@ -1902,6 +1925,7 @@ struct JetTaggerHFQA {
19021925
if (collision.isOutlier()) {
19031926
return;
19041927
}
1928+
registry.fill(HIST("h_collision_events"), 1.5, collision.weight()); // mcd events
19051929
for (auto const& mcdjet : mcdjets) {
19061930
if (!jetfindingutilities::isInEtaAcceptance(mcdjet, jetEtaCuts->at(0), jetEtaCuts->at(1), trackCuts->at(2), trackCuts->at(3))) {
19071931
continue;

0 commit comments

Comments
 (0)