Skip to content

Commit 3b8bfc8

Browse files
hanseoparkhanseopark
authored
[PWGJE] revise histogram of type, axis and name (#13298)
1 parent 4139c47 commit 3b8bfc8

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

‎PWGJE/Tasks/jetTaggerHFQA.cxx‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,12 @@ struct JetTaggerHFQA {
382382
registry.add("h2_jet_phi_mult", "", {HistType::kTH2F, {{axisPhi}, {axisMult}}});
383383
if (fillGeneralSVQA) {
384384
registry.add("h2_3prong_nprongs_mult", "", {HistType::kTH2F, {{axisNprongs}, {axisMult}}});
385-
registry.add("hn_jet_3prong_mult", "", {HistType::kTHnF, {{axisJetPt}, {axisLxy}, {axisSigmaLxy}, {axisSxy}, {axisLxyz}, {axisSigmaLxyz}, {axisSxyz}, {axisMult}}});
385+
registry.add("hn_jet_3prong_mult", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisLxy}, {axisSigmaLxy}, {axisSxy}, {axisLxyz}, {axisSigmaLxyz}, {axisSxyz}, {axisMult}}});
386386
}
387-
registry.add("hn_jet_pt_3prong_Sxy_N1_mult", "", {HistType::kTHnF, {{axisJetPt}, {axisSxy}, {axisMass}, {axisMult}}});
388-
registry.add("hn_jet_pt_3prong_Sxyz_N1_mult", "", {HistType::kTHnF, {{axisJetPt}, {axisSxyz}, {axisMass}, {axisMult}}});
387+
registry.add("hn_jet_3prong_Sxy_N1_mult", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxy}, {axisMass}, {axisMult}}});
388+
registry.add("hn_jet_3prong_Sxyz_N1_mult", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxyz}, {axisMass}, {axisMult}}});
389+
registry.add("hn_taggedjet_3prong_Sxy_N1_mult", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxy}, {axisMass}, {axisMult}}});
390+
registry.add("hn_taggedjet_3prong_Sxyz_N1_mult", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxyz}, {axisMass}, {axisMult}}});
389391
}
390392
if (doprocessSV2ProngMCD || doprocessSV2ProngMCDWeighted || doprocessSV2ProngMCPMCDMatched || doprocessSV2ProngMCPMCDMatchedWeighted) {
391393
if (!(doprocessIPsMCD || doprocessIPsMCDWeighted || doprocessIPsMCPMCDMatched || doprocessIPsMCPMCDMatchedWeighted) && !(doprocessJPMCD || doprocessJPMCDWeighted || doprocessJPMCPMCDMatched || doprocessJPMCPMCDMatchedWeighted) && !(doprocessSV3ProngMCD || doprocessSV3ProngMCDWeighted || doprocessSV3ProngMCPMCDMatched || doprocessSV3ProngMCPMCDMatchedWeighted)) {
@@ -435,18 +437,18 @@ struct JetTaggerHFQA {
435437
registry.add("h3_taggedjet_pt_3prong_mass_N1_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisMass}, {axisJetFlavour}}});
436438
registry.add("h3_taggedjet_pt_3prong_mass_xyz_N1_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisMass}, {axisJetFlavour}}});
437439
}
438-
if (doprocessSV3ProngMCDMult) {
439-
registry.add("h2_jet_pt_mult_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisJetFlavour}, {axisMult}}});
440-
registry.add("h2_jet_eta_mult_flavour", "", {HistType::kTH3F, {{axisEta}, {axisJetFlavour}, {axisMult}}});
441-
registry.add("h2_jet_phi_mult_flavour", "", {HistType::kTH3F, {{axisPhi}, {axisJetFlavour}, {axisMult}}});
440+
if (doprocessSV3ProngMCDMult || doprocessSV3ProngMCDMultWeighted || doprocessSV3ProngMCPMCDMatchedMult || doprocessSV3ProngMCPMCDMatchedMultWeighted) {
441+
registry.add("h3_jet_pt_mult_flavour", "", {HistType::kTH3F, {{axisJetPt}, {axisMult}, {axisJetFlavour}}});
442+
registry.add("h3_jet_eta_mult_flavour", "", {HistType::kTH3F, {{axisEta}, {axisMult}, {axisJetFlavour}}});
443+
registry.add("h3_jet_phi_mult_flavour", "", {HistType::kTH3F, {{axisPhi}, {axisMult}, {axisJetFlavour}}});
442444
if (fillGeneralSVQA) {
443445
registry.add("h3_3prong_nprongs_mult_flavour", "", {HistType::kTH3F, {{axisNprongs}, {axisMult}, {axisJetFlavour}}});
444-
registry.add("hn_jet_3prong_mult_flavour", "", {HistType::kTHnF, {{axisJetPt}, {axisLxy}, {axisSigmaLxy}, {axisSxy}, {axisLxyz}, {axisSigmaLxyz}, {axisSxyz}, {axisMult}, {axisJetFlavour}}});
446+
registry.add("hn_jet_3prong_mult_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisLxy}, {axisSigmaLxy}, {axisSxy}, {axisLxyz}, {axisSigmaLxyz}, {axisSxyz}, {axisMult}, {axisJetFlavour}}});
445447
}
446-
registry.add("hn_jet_3prong_Sxy_N1_mult_flavour", "", {HistType::kTHnF, {{axisJetPt}, {axisSxy}, {axisMass}, {axisMult}, {axisJetFlavour}}});
447-
registry.add("hn_jet_3prong_Sxyz_N1_mult_flavour", "", {HistType::kTHnF, {{axisJetPt}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
448-
registry.add("hn_taggedjet_3prong_Sxy_N1_mult_flavour", "", {HistType::kTHnF, {{axisJetPt}, {axisSxy}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
449-
registry.add("hn_taggedjet_3prong_Sxyz_N1_mult_flavour", "", {HistType::kTHnF, {{axisJetPt}, {axisSxy}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
448+
registry.add("hn_jet_3prong_Sxy_N1_mult_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxy}, {axisMass}, {axisMult}, {axisJetFlavour}}});
449+
registry.add("hn_jet_3prong_Sxyz_N1_mult_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
450+
registry.add("hn_taggedjet_3prong_Sxy_N1_mult_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxy}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
451+
registry.add("hn_taggedjet_3prong_Sxyz_N1_mult_flavour", "", {HistType::kTHnSparseF, {{axisJetPt}, {axisSxy}, {axisSxyz}, {axisMass}, {axisMult}, {axisJetFlavour}}});
450452
}
451453
}
452454

@@ -1022,9 +1024,9 @@ struct JetTaggerHFQA {
10221024
if (checkSv && jettaggingutilities::svAcceptance(bjetCand, svDispersionMax)) {
10231025
auto maxSxy = bjetCand.decayLengthXY() / bjetCand.errorDecayLengthXY();
10241026
auto massSV = bjetCand.m();
1025-
registry.fill(HIST("hn_jet_pt_3prong_Sxy_N1_mult"), jet.pt(), maxSxy, massSV, mult);
1027+
registry.fill(HIST("hn_jet_3prong_Sxy_N1_mult"), jet.pt(), maxSxy, massSV, mult);
10261028
if (jet.isTagged(BJetTaggingMethod::SV)) {
1027-
registry.fill(HIST("hn_taggedjet_pt_3prong_Sxy_N1_mult"), jet.pt(), maxSxy, massSV, mult);
1029+
registry.fill(HIST("hn_taggedjet_3prong_Sxy_N1_mult"), jet.pt(), maxSxy, massSV, mult);
10281030
}
10291031
}
10301032
if (fillSVxyz) {
@@ -1033,9 +1035,9 @@ struct JetTaggerHFQA {
10331035
if (checkSv && jettaggingutilities::svAcceptance(bjetCandXYZ, svDispersionMax)) {
10341036
auto maxSxyz = bjetCandXYZ.decayLength() / bjetCandXYZ.errorDecayLength();
10351037
auto massSV = bjetCandXYZ.m();
1036-
registry.fill(HIST("h2_jet_pt_3prong_Sxy_N1_mult"), jet.pt(), maxSxyz, massSV, mult);
1038+
registry.fill(HIST("hn_jet_3prong_Sxyz_N1_mult"), jet.pt(), maxSxyz, massSV, mult);
10371039
if (jet.isTagged(BJetTaggingMethod::SV3D)) {
1038-
registry.fill(HIST("h2_taggedjet_pt_3prong_Sxyz_N1_mult"), jet.pt(), maxSxyz, massSV, mult);
1040+
registry.fill(HIST("hn_taggedjet_3prong_Sxyz_N1_mult"), jet.pt(), maxSxyz, massSV, mult);
10391041
}
10401042
}
10411043
}
@@ -1168,7 +1170,7 @@ struct JetTaggerHFQA {
11681170
registry.fill(HIST("h3_jet_eta_mult_flavour"), mcdjet.eta(), mult, origin, eventWeight);
11691171
registry.fill(HIST("h3_jet_phi_mult_flavour"), mcdjet.phi(), mult, origin, eventWeight);
11701172
if (fillGeneralSVQA) {
1171-
registry.fill(HIST("h3_3prong_nprongs_mult_flavour"), mcdjet.template secondaryVertices_as<V>().size(), mult, origin);
1173+
registry.fill(HIST("h3_3prong_nprongs_mult_flavour"), mcdjet.template secondaryVertices_as<V>().size(), mult, origin, eventWeight);
11721174
for (const auto& prong : mcdjet.template secondaryVertices_as<V>()) {
11731175
registry.fill(HIST("hn_jet_3prong_mult_flavour"), mcdjet.pt(), prong.decayLengthXY(), prong.errorDecayLengthXY(), prong.decayLengthXY() / prong.errorDecayLengthXY(), prong.decayLength(), prong.errorDecayLengthXY(), prong.decayLength() / prong.errorDecayLengthXY(), origin, eventWeight);
11741176
}
@@ -1180,7 +1182,7 @@ struct JetTaggerHFQA {
11801182
auto massSV = bjetCand.m();
11811183
registry.fill(HIST("hn_jet_3prong_Sxy_N1_mult_flavour"), mcdjet.pt(), maxSxy, massSV, mult, origin, eventWeight);
11821184
if (mcdjet.isTagged(BJetTaggingMethod::SV)) {
1183-
registry.fill(HIST("hn_taggedjet_pt_3prong_Sxy_N1_mult_flavour"), mcdjet.pt(), maxSxy, massSV, mult, origin, eventWeight);
1185+
registry.fill(HIST("hn_taggedjet_3prong_Sxy_N1_mult_flavour"), mcdjet.pt(), maxSxy, massSV, mult, origin, eventWeight);
11841186
}
11851187
}
11861188
if (fillSVxyz) {
@@ -1190,7 +1192,7 @@ struct JetTaggerHFQA {
11901192
auto massSV = bjetCandXYZ.m();
11911193
registry.fill(HIST("hn_jet_3prong_Sxyz_N1_mult_flavour"), mcdjet.pt(), maxSxyz, massSV, mult, origin, eventWeight);
11921194
if (mcdjet.isTagged(BJetTaggingMethod::SV3D)) {
1193-
registry.fill(HIST("hn_taggedjet_pt_3prong_Sxyz_N1_mult_flavour"), mcdjet.pt(), maxSxyz, massSV, mult, origin, eventWeight);
1195+
registry.fill(HIST("hn_taggedjet_3prong_Sxyz_N1_mult_flavour"), mcdjet.pt(), maxSxyz, massSV, mult, origin, eventWeight);
11941196
}
11951197
}
11961198
}

0 commit comments

Comments
 (0)