Skip to content

Commit b965087

Browse files
authored
Merge branch 'AliceO2Group:master' into master
2 parents 00e87f6 + 1e08c45 commit b965087

24 files changed

+1330
-730
lines changed

Common/TableProducer/PID/pidTOFMerge.cxx

Lines changed: 110 additions & 402 deletions
Large diffs are not rendered by default.

Common/TableProducer/eventSelection.cxx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,10 +1201,12 @@ struct LumiTask {
12011201
histos.add("hCounterTCE", "", kTH1D, {{1, 0., 1.}});
12021202
histos.add("hCounterZEM", "", kTH1D, {{1, 0., 1.}});
12031203
histos.add("hCounterZNC", "", kTH1D, {{1, 0., 1.}});
1204+
histos.add("hCounterTVXZDC", "", kTH1D, {{1, 0., 1.}});
12041205
histos.add("hCounterTVXafterBCcuts", "", kTH1D, {{1, 0., 1.}});
12051206
histos.add("hCounterTCEafterBCcuts", "", kTH1D, {{1, 0., 1.}});
12061207
histos.add("hCounterZEMafterBCcuts", "", kTH1D, {{1, 0., 1.}});
12071208
histos.add("hCounterZNCafterBCcuts", "", kTH1D, {{1, 0., 1.}});
1209+
histos.add("hCounterTVXZDCafterBCcuts", "", kTH1D, {{1, 0., 1.}});
12081210
histos.add("hLumiTVX", ";;Luminosity, 1/#mub", kTH1D, {{1, 0., 1.}});
12091211
histos.add("hLumiTCE", ";;Luminosity, 1/#mub", kTH1D, {{1, 0., 1.}});
12101212
histos.add("hLumiZEM", ";;Luminosity, 1/#mub", kTH1D, {{1, 0., 1.}});
@@ -1428,9 +1430,15 @@ struct LumiTask {
14281430
if (isTriggerTVX) {
14291431
histos.get<TH1>(HIST("hCounterTVX"))->Fill(srun, 1);
14301432
histos.get<TH1>(HIST("hLumiTVX"))->Fill(srun, lumiTVX);
1433+
if (isTriggerZNA && isTriggerZNC) {
1434+
histos.get<TH1>(HIST("hCounterTVXZDC"))->Fill(srun, 1);
1435+
}
14311436
if (noBorder) {
14321437
histos.get<TH1>(HIST("hCounterTVXafterBCcuts"))->Fill(srun, 1);
14331438
histos.get<TH1>(HIST("hLumiTVXafterBCcuts"))->Fill(srun, lumiTVX);
1439+
if (isTriggerZNA && isTriggerZNC) {
1440+
histos.get<TH1>(HIST("hCounterTVXZDCafterBCcuts"))->Fill(srun, 1);
1441+
}
14341442
for (size_t i = 0; i < mRCTFlagsCheckers.size(); i++) {
14351443
if (mRCTFlagsCheckers[i](bc))
14361444
histos.get<TH2>(HIST("hLumiTVXafterBCcutsRCT"))->Fill(srun, i, lumiTVX);

Common/Tools/EventSelectionModule.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,10 +1553,12 @@ class LumiModule
15531553
histos.add("luminosity/hCounterTCE", "", framework::kTH1D, {{1, 0., 1.}});
15541554
histos.add("luminosity/hCounterZEM", "", framework::kTH1D, {{1, 0., 1.}});
15551555
histos.add("luminosity/hCounterZNC", "", framework::kTH1D, {{1, 0., 1.}});
1556+
histos.add("luminosity/hCounterTVXZDC", "", framework::kTH1D, {{1, 0., 1.}});
15561557
histos.add("luminosity/hCounterTVXafterBCcuts", "", framework::kTH1D, {{1, 0., 1.}});
15571558
histos.add("luminosity/hCounterTCEafterBCcuts", "", framework::kTH1D, {{1, 0., 1.}});
15581559
histos.add("luminosity/hCounterZEMafterBCcuts", "", framework::kTH1D, {{1, 0., 1.}});
15591560
histos.add("luminosity/hCounterZNCafterBCcuts", "", framework::kTH1D, {{1, 0., 1.}});
1561+
histos.add("luminosity/hCounterTVXZDCafterBCcuts", "", framework::kTH1D, {{1, 0., 1.}});
15601562
histos.add("luminosity/hLumiTVX", ";;Luminosity, 1/#mub", framework::kTH1D, {{1, 0., 1.}});
15611563
histos.add("luminosity/hLumiTCE", ";;Luminosity, 1/#mub", framework::kTH1D, {{1, 0., 1.}});
15621564
histos.add("luminosity/hLumiZEM", ";;Luminosity, 1/#mub", framework::kTH1D, {{1, 0., 1.}});
@@ -1799,9 +1801,15 @@ class LumiModule
17991801
if (isTriggerTVX) {
18001802
histos.template get<TH1>(HIST("luminosity/hCounterTVX"))->Fill(srun, 1);
18011803
histos.template get<TH1>(HIST("luminosity/hLumiTVX"))->Fill(srun, lumiTVX);
1804+
if (isTriggerZNA && isTriggerZNC) {
1805+
histos.template get<TH1>(HIST("luminosity/hCounterTVXZDC"))->Fill(srun, 1);
1806+
}
18021807
if (noBorder) {
18031808
histos.template get<TH1>(HIST("luminosity/hCounterTVXafterBCcuts"))->Fill(srun, 1);
18041809
histos.template get<TH1>(HIST("luminosity/hLumiTVXafterBCcuts"))->Fill(srun, lumiTVX);
1810+
if (isTriggerZNA && isTriggerZNC) {
1811+
histos.template get<TH1>(HIST("luminosity/hCounterTVXZDCafterBCcuts"))->Fill(srun, 1);
1812+
}
18051813
for (size_t i = 0; i < mRCTFlagsCheckers.size(); i++) {
18061814
if ((rct & mRCTFlagsCheckers[i].value()) == 0)
18071815
histos.template get<TH2>(HIST("luminosity/hLumiTVXafterBCcutsRCT"))->Fill(srun, i, lumiTVX);

PWGCF/FemtoUniverse/Core/FemtoUniverseCascadeSelection.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ void FemtoUniverseCascadeSelection::init(HistogramRegistry* registry)
317317
"container - quitting!";
318318
}
319319

320-
posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
320+
posDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
321321
aod::femtouniverseparticle::TrackType::kPosChild,
322322
aod::femtouniverseparticle::CutContainerType>(
323323
mHistogramRegistry);
324-
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kV0Child,
324+
negDaughTrack.init<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
325325
aod::femtouniverseparticle::TrackType::kNegChild,
326326
aod::femtouniverseparticle::CutContainerType>(
327327
mHistogramRegistry);
@@ -580,9 +580,9 @@ void FemtoUniverseCascadeSelection::fillCascadeQA(Col const& col, Casc const& ca
580580
template <typename Col, typename Casc, typename Track>
581581
void FemtoUniverseCascadeSelection::fillQA(Col const& /*col*/, Casc const& /*cascade*/, Track const& posTrack, Track const& negTrack, Track const& bachTrack)
582582
{
583-
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
583+
posDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
584584
aod::femtouniverseparticle::TrackType::kPosChild>(posTrack);
585-
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kV0Child,
585+
negDaughTrack.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeV0Child,
586586
aod::femtouniverseparticle::TrackType::kNegChild>(negTrack);
587587
bachTrackSel.fillQA<aod::femtouniverseparticle::ParticleType::kCascadeBachelor,
588588
aod::femtouniverseparticle::TrackType::kBachelor>(bachTrack);

PWGCF/FemtoUniverse/DataModel/FemtoDerived.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@
1616
#ifndef PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
1717
#define PWGCF_FEMTOUNIVERSE_DATAMODEL_FEMTODERIVED_H_
1818

19-
#include <cmath>
20-
#include "Framework/ASoA.h"
21-
#include "MathUtils/Utils.h"
22-
#include "Framework/DataTypes.h"
2319
#include "Common/DataModel/Multiplicity.h"
20+
#include "Common/DataModel/PIDResponse.h"
21+
#include "Common/DataModel/TrackSelectionTables.h"
22+
23+
#include "Framework/ASoA.h"
2424
#include "Framework/AnalysisDataModel.h"
25+
#include "Framework/DataTypes.h"
2526
#include "Framework/Expressions.h"
26-
#include "Common/DataModel/TrackSelectionTables.h"
27-
#include "Common/DataModel/PIDResponse.h"
27+
#include "MathUtils/Utils.h"
28+
29+
#include <cmath>
2830

2931
namespace o2::aod
3032
{
@@ -64,6 +66,7 @@ enum ParticleType {
6466
kV0, //! V0
6567
kV0Child, //! Child track of a V0
6668
kCascade, //! Cascade
69+
kCascadeV0Child, //! Child track of a V0 coming from a cascade
6770
kCascadeBachelor, //! Bachelor track of a cascade
6871
kPhi, //! Phi meson
6972
kPhiChild, //! Child track of a Phi meson
@@ -72,7 +75,7 @@ enum ParticleType {
7275
kNParticleTypes //! Number of particle types
7376
};
7477

75-
static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
78+
static constexpr std::string_view ParticleTypeName[kNParticleTypes] = {"Tracks", "MCTruthTracks", "V0", "V0Child", "Cascade", "CascadeV0Child,", "CascadeBachelor", "Phi", "PhiChild", "D0", "D0Child"}; //! Naming of the different particle types
7679
static constexpr std::string_view TempFitVarName[kNParticleTypes] = {"/hDCAxy", "/hPDGvspT", "/hCPA", "/hDCAxy", "/hCPA", "/hDCAxy", "/hInvMass", "/hDCAxy", "/hInvMass", "/hDCAxy"};
7780

7881
using CutContainerType = uint32_t; //! Definition of the data type for the bit-wise container for the different selection criteria

PWGHF/HFC/TableProducer/correlatorHfeHadrons.cxx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,11 @@ struct HfCorrelatorHfeHadrons {
133133
registry.add("hInclusiveEHCorrel", "Sparse for Delta phi and Delta eta Inclusive Electron with Hadron;p_{T}^{e} (GeV#it{/c});p_{T}^{h} (GeV#it{/c});#Delta#varphi;#Delta#eta;", {HistType::kTHnSparseF, {{axisPt}, {axisPt}, {axisDeltaPhi}, {axisDeltaEta}}});
134134
registry.add("hLSEHCorrel", "Sparse for Delta phi and Delta eta Like sign Electron pair with Hadron;p_{T}^{e} (GeV#it{/c});p_{T}^{h} (GeV#it{/c});#Delta#varphi;#Delta#eta;", {HistType::kTHnSparseF, {{axisPt}, {axisPt}, {axisDeltaPhi}, {axisDeltaEta}}});
135135
registry.add("hULSEHCorrel", "Sparse for Delta phi and Delta eta UnLike sign Electron pair with Hadron;p_{T}^{e} (GeV#it{/c});p_{T}^{h} (GeV#it{/c});#Delta#varphi;#Delta#eta;", {HistType::kTHnSparseF, {{axisPt}, {axisPt}, {axisDeltaPhi}, {axisDeltaEta}}});
136-
registry.add("hTofnSigmaVsP", " Tof nSigma info vs P; n#sigma;#it{p} (GeV#it{/c});passEMcal;", {HistType::kTH2F, {{axisNSigma}, {axisPt}}});
137-
registry.add("hTpcnSigmaVsP", " TPC nSigma info vs P; n#sigma;#it{p} (GeV#it{/c});passEMcal;", {HistType::kTH2F, {{axisNSigma}, {axisPt}}});
136+
registry.add("hTpcTofNSigmaVsPt", " TPC and TOF nSigma info vs pt; n#sigma; n#sigma;#it{pt} (GeV/#it{c});", {HistType::kTH3F, {{axisNSigma}, {axisNSigma}, {axisPt}}});
137+
138+
// After electron selection Information
139+
registry.add("hTofNSigmaVsPt", " TOF nSigma info vs pt; n#sigma;#it{pt} (GeV/#it{c});", {HistType::kTH2F, {{axisNSigma}, {axisPt}}});
140+
registry.add("hTpcNSigmaVsPt", " TPC nSigma info vs pt; n#sigma;#it{pt} (GeV/#it{c});", {HistType::kTH2F, {{axisNSigma}, {axisPt}}});
138141

139142
registry.add("hMCgenNonHfEHCorrel", "Sparse for Delta phi and Delta eta for McGen Non Hf Electron with Hadron;p_{T}^{e} (GeV#it{/c});p_{T}^{h} (GeV#it{/c});#Delta#varphi;#Delta#eta;", {HistType::kTHnSparseF, {{axisPt}, {axisPt}, {axisDeltaPhi}, {axisDeltaEta}}});
140143
registry.add("hMCgenInclusiveEHCorrl", "Sparse for Delta phi and Delta eta for McGen Electron pair with Hadron;p_{T}^{e} (GeV#it{/c});p_{T}^{h} (GeV#it{/c});#Delta#varphi;#Delta#eta;", {HistType::kTHnSparseF, {{axisPt}, {axisPt}, {axisDeltaPhi}, {axisDeltaEta}}});
@@ -229,11 +232,14 @@ struct HfCorrelatorHfeHadrons {
229232
acceptElectron = true;
230233
} else if (!eTrack.isEmcal() && !requireEmcal) {
231234

232-
// Apply sigma cut
235+
registry.fill(HIST("hTpcTofNSigmaVsPt"), eTrack.tofNSigmaElTrack(), eTrack.tpcNSigmaElTrack(), eTrack.ptTrack());
236+
237+
// After electron selection Information
233238
if (std::abs(eTrack.tofNSigmaElTrack()) < tofNSigmaEl && eTrack.tpcNSigmaElTrack() > tpcNsigmaElectronMin &&
234239
eTrack.tpcNSigmaElTrack() < tpcNsigmaElectronMax) {
235-
registry.fill(HIST("hTofnSigmaVsP"), eTrack.tofNSigmaElTrack(), eTrack.ptTrack());
236-
registry.fill(HIST("hTpcnSigmaVsP"), eTrack.tpcNSigmaElTrack(), eTrack.ptTrack());
240+
241+
registry.fill(HIST("hTofNSigmaVsPt"), eTrack.tofNSigmaElTrack(), eTrack.ptTrack());
242+
registry.fill(HIST("hTpcNSigmaVsPt"), eTrack.tpcNSigmaElTrack(), eTrack.ptTrack());
237243
acceptElectron = true;
238244
}
239245
}

PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
504504
}
505505

506506
// Filling candidate properties
507-
rowKfCandidateFull.reserve(candidates.size());
507+
rowKfCandidateLite.reserve(candidates.size());
508508
for (const auto& candidate : candidates) {
509509
fillKfCandidateLite(candidate, collisions, -7, RecoDecay::OriginType::None, false, -1.);
510510
}
@@ -560,7 +560,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
560560
}
561561

562562
// Filling candidate properties
563-
rowKfCandidateFull.reserve(candidates.size());
563+
rowKfCandidateLite.reserve(candidates.size());
564564
for (const auto& candidate : candidates) {
565565
auto collision = candidate.collision_as<CollsWithFT0M>();
566566
float centFt0m = o2::hf_centrality::getCentralityColl(collision);
@@ -600,7 +600,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
600600
}
601601

602602
// Filling candidate properties
603-
rowCandidateLite.reserve(candidates.size());
603+
rowKfCandidateFull.reserve(candidates.size());
604604
for (const auto& candidate : candidates) {
605605
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
606606
continue;
@@ -620,7 +620,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
620620
}
621621

622622
// Filling candidate properties
623-
rowCandidateLite.reserve(candidates.size());
623+
rowKfCandidateLite.reserve(candidates.size());
624624
for (const auto& candidate : candidates) {
625625
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
626626
continue;
@@ -665,7 +665,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
665665
}
666666

667667
// Filling candidate properties
668-
rowCandidateLite.reserve(candidates.size());
668+
rowKfCandidateFull.reserve(candidates.size());
669669
for (const auto& candidate : candidates) {
670670
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
671671
continue;
@@ -688,7 +688,7 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
688688
}
689689

690690
// Filling candidate properties
691-
rowCandidateLite.reserve(candidates.size());
691+
rowKfCandidateLite.reserve(candidates.size());
692692
for (const auto& candidate : candidates) {
693693
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
694694
continue;

PWGJE/TableProducer/eventwiseConstituentSubtractor.cxx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ struct eventWiseConstituentSubtractorTask {
8080
Configurable<float> rMax{"rMax", 0.24, "maximum distance of subtraction"};
8181
Configurable<float> eventEtaMax{"eventEtaMax", 0.9, "maximum pseudorapidity of event"};
8282
Configurable<bool> doRhoMassSub{"doRhoMassSub", true, "perfom mass subtraction as well"};
83+
Configurable<double> ghostRapMax{"ghostRapMax", 0.9, "Ghost rapidity max"};
84+
Configurable<int> ghostRepeat{"ghostRepeat", 1, "Ghost tiling repeats"};
85+
Configurable<double> ghostArea{"ghostArea", 0.005, "Area per ghost"};
86+
Configurable<double> ghostGridScatter{"ghostGridScatter", 1.0, "Grid scatter"};
87+
Configurable<double> ghostKtScatter{"ghostKtScatter", 0.1, "kT scatter"};
88+
Configurable<double> ghostMeanPt{"ghostMeanPt", 1e-100, "Mean ghost pT"};
8389

8490
JetBkgSubUtils eventWiseConstituentSubtractor;
8591
std::vector<fastjet::PseudoJet> inputParticles;
@@ -98,6 +104,9 @@ struct eventWiseConstituentSubtractorTask {
98104
eventWiseConstituentSubtractor.setDoRhoMassSub(doRhoMassSub);
99105
eventWiseConstituentSubtractor.setConstSubAlphaRMax(alpha, rMax);
100106
eventWiseConstituentSubtractor.setMaxEtaEvent(eventEtaMax);
107+
fastjet::GhostedAreaSpec ghostAreaSpec(ghostRapMax, ghostRepeat, ghostArea,
108+
ghostGridScatter, ghostKtScatter, ghostMeanPt);
109+
eventWiseConstituentSubtractor.setGhostAreaSpec(ghostAreaSpec);
101110

102111
if (applyTrackingEfficiency) {
103112
if (trackingEfficiencyPtBinning->size() < 2) {

PWGJE/TableProducer/rhoEstimator.cxx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@ struct RhoEstimatorTask {
8686
Configurable<float> bkgjetR{"bkgjetR", 0.2, "jet resolution parameter for determining background density"};
8787
Configurable<float> bkgEtaMin{"bkgEtaMin", -0.7, "minimim pseudorapidity for determining background density"};
8888
Configurable<float> bkgEtaMax{"bkgEtaMax", 0.7, "maximum pseudorapidity for determining background density"};
89-
Configurable<float> bkgPhiMin{"bkgPhiMin", -99., "minimim phi for determining background density"};
90-
Configurable<float> bkgPhiMax{"bkgPhiMax", 99., "maximum phi for determining background density"};
89+
Configurable<float> bkgPhiMin{"bkgPhiMin", -6.283, "minimim phi for determining background density"};
90+
Configurable<float> bkgPhiMax{"bkgPhiMax", 6.283, "maximum phi for determining background density"};
9191
Configurable<bool> doSparse{"doSparse", false, "perfom sparse estimation"};
92+
Configurable<double> ghostRapMax{"ghostRapMax", 0.9, "Ghost rapidity max"};
93+
Configurable<int> ghostRepeat{"ghostRepeat", 1, "Ghost tiling repeats"};
94+
Configurable<double> ghostArea{"ghostArea", 0.005, "Area per ghost"};
95+
Configurable<double> ghostGridScatter{"ghostGridScatter", 1.0, "Grid scatter"};
96+
Configurable<double> ghostKtScatter{"ghostKtScatter", 0.1, "kT scatter"};
97+
Configurable<double> ghostMeanPt{"ghostMeanPt", 1e-100, "Mean ghost pT"};
9298

9399
Configurable<float> thresholdTriggerTrackPtMin{"thresholdTriggerTrackPtMin", 0.0, "Minimum trigger track pt to accept event"};
94100
Configurable<float> thresholdClusterEnergyMin{"thresholdClusterEnergyMin", 0.0, "Minimum cluster energy to accept event"};
@@ -134,6 +140,11 @@ struct RhoEstimatorTask {
134140
bkgPhiMin_ = -2.0 * M_PI;
135141
}
136142
bkgSub.setPhiMinMax(bkgPhiMin_, bkgPhiMax_);
143+
144+
fastjet::GhostedAreaSpec ghostAreaSpec(config.ghostRapMax, config.ghostRepeat, config.ghostArea,
145+
config.ghostGridScatter, config.ghostKtScatter, config.ghostMeanPt);
146+
bkgSub.setGhostAreaSpec(ghostAreaSpec);
147+
137148
eventSelectionBits = jetderiveddatautilities::initialiseEventSelectionBits(static_cast<std::string>(config.eventSelections));
138149
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(config.triggerMasks);
139150

PWGJE/Tasks/jetTutorial.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ struct JetTutorialTask {
215215

216216
using JetMCPTable = soa::Filtered<soa::Join<aod::ChargedMCParticleLevelJets, aod::ChargedMCParticleLevelJetConstituents, aod::ChargedMCParticleLevelJetsMatchedToChargedMCDetectorLevelJets>>;
217217
void processMCMatchedCharged(soa::Filtered<aod::JetCollisionsMCD>::iterator const& collision,
218+
aod::JetMcCollisions const&,
218219
soa::Filtered<soa::Join<aod::ChargedMCDetectorLevelJets, aod::ChargedMCDetectorLevelJetConstituents, aod::ChargedMCDetectorLevelJetsMatchedToChargedMCParticleLevelJets>> const& mcdjets,
219220
JetMCPTable const&,
220221
aod::JetTracks const&,
@@ -226,8 +227,8 @@ struct JetTutorialTask {
226227
for (const auto& mcdjet : mcdjets) {
227228
for (auto& mcpjet : mcdjet.template matchedJetGeo_as<JetMCPTable>()) {
228229
registry.fill(HIST("h_matched_jets_pt"), mcpjet.pt(), mcdjet.pt(), collision.mcCollision().weight());
229-
registry.fill(HIST("h_matched_jets_pt"), mcpjet.phi(), mcdjet.phi(), collision.mcCollision().weight());
230-
registry.fill(HIST("h_matched_jets_pt"), mcpjet.eta(), mcdjet.eta(), collision.mcCollision().weight());
230+
registry.fill(HIST("h_matched_jets_phi"), mcpjet.phi(), mcdjet.phi(), collision.mcCollision().weight());
231+
registry.fill(HIST("h_matched_jets_eta"), mcpjet.eta(), mcdjet.eta(), collision.mcCollision().weight());
231232
}
232233
}
233234
}

0 commit comments

Comments
 (0)