Skip to content

Commit a0dda40

Browse files
qgpqgp
committed
Adapt tasks to updated jet tables
1 parent 377dd15 commit a0dda40

6 files changed

Lines changed: 64 additions & 64 deletions

File tree

‎PWGJE/DataModel/JetSubstructure.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,29 +103,29 @@ JETSUBSTRUCTUREOUTPUT_TABLE_DEF(MCParticleLevelJet, mcparticleleveljet, "JETMCPA
103103
JETSUBSTRUCTURE_TABLE_DEF(D0Jet, D0jet, "D0JETSS");
104104
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(D0Jet, D0jet, "D0JETSSO");
105105

106-
JETSUBSTRUCTURE_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0JETMCDETSS");
107-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0JETMCDETSSO");
106+
JETSUBSTRUCTURE_TABLE_DEF(D0MCDJet, D0mcdjet, "D0JETMCDETSS");
107+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(D0MCDJet, D0mcdjet, "D0JETMCDETSSO");
108108

109-
JETSUBSTRUCTURE_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0JETMCPARTSS");
110-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0JETMCPARTSSO");
109+
JETSUBSTRUCTURE_TABLE_DEF(D0MCPJet, D0mcpjet, "D0JETMCPARTSS");
110+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(D0MCPJet, D0mcpjet, "D0JETMCPARTSSO");
111111

112112
JETSUBSTRUCTURE_TABLE_DEF(LcJet, Lcjet, "LcJETSS");
113113
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(LcJet, Lcjet, "LcJETSSO");
114114

115-
JETSUBSTRUCTURE_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcJETMCDETSS");
116-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcJETMCDETSSO");
115+
JETSUBSTRUCTURE_TABLE_DEF(LcMCDJet, Lcmcdjet, "LcJETMCDETSS");
116+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(LcMCDJet, Lcmcdjet, "LcJETMCDETSSO");
117117

118-
JETSUBSTRUCTURE_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcJETMCPARTSS");
119-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcJETMCPARTSSO");
118+
JETSUBSTRUCTURE_TABLE_DEF(LcMCPJet, Lcmcpjet, "LcJETMCPARTSS");
119+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(LcMCPJet, Lcmcpjet, "LcJETMCPARTSSO");
120120

121-
JETSUBSTRUCTURE_TABLE_DEF(BPlusJet, BPlusjet, "BPLJETSS");
122-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(BPlusJet, BPlusjet, "BPLJETOut");
121+
JETSUBSTRUCTURE_TABLE_DEF(BPlJet, BPljet, "BPLJETSS");
122+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(BPlJet, BPljet, "BPLJETOut");
123123

124-
JETSUBSTRUCTURE_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPLJETMCDETSS");
125-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPLJETMCDETSSO");
124+
JETSUBSTRUCTURE_TABLE_DEF(BPlMCDJet, BPlMCDjet, "BPLJETMCDETSS");
125+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(BPlMCDJet, BPlmcdjet, "BPLJETMCDETSSO");
126126

127-
JETSUBSTRUCTURE_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPLJETMCPARTSS");
128-
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPLJETMCPARTSSO");
127+
JETSUBSTRUCTURE_TABLE_DEF(BPlMCPJet, BPlmcpjet, "BPLJETMCPARTSS");
128+
JETSUBSTRUCTUREOUTPUTHF_TABLE_DEF(BPlMCPJet, BPlmcpjet, "BPLJETMCPARTSSO");
129129

130130
} // namespace o2::aod
131131

‎PWGJE/TableProducer/jetfinderhf.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,16 +612,16 @@ struct JetFinderHFTask {
612612
};
613613

614614
using JetFinderD0 = JetFinderHFTask<o2::aod::D0Jets, o2::aod::D0JetConstituents, o2::aod::D0JetConstituentsSub>;
615-
using MCDetectorLevelJetFinderD0 = JetFinderHFTask<o2::aod::MCDetectorLevelD0Jets, o2::aod::MCDetectorLevelD0JetConstituents, o2::aod::MCDetectorLevelD0JetConstituentsSub>;
616-
using MCParticleLevelJetFinderD0 = JetFinderHFTask<o2::aod::MCParticleLevelD0Jets, o2::aod::MCParticleLevelD0JetConstituents, o2::aod::MCParticleLevelD0JetConstituentsSub>;
615+
using MCDetectorLevelJetFinderD0 = JetFinderHFTask<o2::aod::D0MCDJets, o2::aod::D0MCDJetConstituents, o2::aod::D0MCDJetConstituentsSub>;
616+
using MCParticleLevelJetFinderD0 = JetFinderHFTask<o2::aod::D0MCPJets, o2::aod::D0MCPJetConstituents, o2::aod::D0MCPJetConstituentsSub>;
617617

618-
using JetFinderBPlus = JetFinderHFTask<o2::aod::BPlusJets, o2::aod::BPlusJetConstituents, o2::aod::BPlusJetConstituentsSub>;
619-
using MCDetectorLevelJetFinderBPlus = JetFinderHFTask<o2::aod::MCDetectorLevelBPlusJets, o2::aod::MCDetectorLevelBPlusJetConstituents, o2::aod::MCDetectorLevelBPlusJetConstituentsSub>;
620-
using MCParticleLevelJetFinderBPlus = JetFinderHFTask<o2::aod::MCParticleLevelBPlusJets, o2::aod::MCParticleLevelBPlusJetConstituents, o2::aod::MCParticleLevelBPlusJetConstituentsSub>;
618+
using JetFinderBPlus = JetFinderHFTask<o2::aod::BPlJets, o2::aod::BPlJetConstituents, o2::aod::BPlJetConstituentsSub>;
619+
using MCDetectorLevelJetFinderBPlus = JetFinderHFTask<o2::aod::BPlMCDJets, o2::aod::BPlMCDJetConstituents, o2::aod::BPlMCDJetConstituentsSub>;
620+
using MCParticleLevelJetFinderBPlus = JetFinderHFTask<o2::aod::BPlMCPJets, o2::aod::BPlMCPJetConstituents, o2::aod::BPlMCPJetConstituentsSub>;
621621

622622
using JetFinderLc = JetFinderHFTask<o2::aod::LcJets, o2::aod::LcJetConstituents, o2::aod::LcJetConstituentsSub>;
623-
using MCDetectorLevelJetFinderLc = JetFinderHFTask<o2::aod::MCDetectorLevelLcJets, o2::aod::MCDetectorLevelLcJetConstituents, o2::aod::MCDetectorLevelLcJetConstituentsSub>;
624-
using MCParticleLevelJetFinderLc = JetFinderHFTask<o2::aod::MCParticleLevelLcJets, o2::aod::MCParticleLevelLcJetConstituents, o2::aod::MCParticleLevelLcJetConstituentsSub>;
623+
using MCDetectorLevelJetFinderLc = JetFinderHFTask<o2::aod::LcMCDJets, o2::aod::LcMCDJetConstituents, o2::aod::LcMCDJetConstituentsSub>;
624+
using MCParticleLevelJetFinderLc = JetFinderHFTask<o2::aod::LcMCPJets, o2::aod::LcMCPJetConstituents, o2::aod::LcMCPJetConstituentsSub>;
625625

626626
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
627627
{

‎PWGJE/TableProducer/jetmatchinghf.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ struct JetMatchingHF {
3535
using Tracks = soa::Join<aod::Tracks, aod::McTrackLabels>;
3636
using HfCandidates = soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>;
3737
using McParticles = soa::Join<aod::McParticles, aod::HfCand2ProngMcGen>;
38-
using DetectorLevelJets = soa::Join<aod::MCDetectorLevelD0Jets, aod::MCDetectorLevelD0JetConstituents>;
39-
using ParticleLevelJets = soa::Join<aod::MCParticleLevelD0Jets, aod::MCParticleLevelD0JetConstituents>;
38+
using DetectorLevelJets = soa::Join<aod::D0MCDJets, aod::D0MCDJetConstituents>;
39+
using ParticleLevelJets = soa::Join<aod::D0MCPJets, aod::D0MCPJetConstituents>;
4040

41-
Produces<aod::MatchedMCParticleDetectorLevelD0Jets> jetsPartToDetMatching;
42-
Produces<aod::MatchedMCDetectorParticleLevelD0Jets> jetsDetToPartMatching;
41+
Produces<aod::NewMatchedD0MCDJets> jetsPartToDetMatching;
42+
Produces<aod::NewMatchedD0MCPJets> jetsDetToPartMatching;
4343

4444
Preslice<ParticleLevelJets> ParticleLevelJetsPerMcCollision = aod::jet::mcCollisionId;
4545

@@ -62,7 +62,7 @@ struct JetMatchingHF {
6262
const auto& cands = jet.hfcandidates_as<HfCandidates>();
6363
int matchedIdx = -1;
6464
if ((cands.front().flagMcMatchRec() & (1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) == 0) {
65-
jetsDetToPartMatching(matchedIdx);
65+
jetsDetToPartMatching(matchedIdx, -1);
6666
continue;
6767
}
6868
for (const auto& cand : cands) {
@@ -92,7 +92,7 @@ struct JetMatchingHF {
9292
}
9393
}
9494
}
95-
jetsDetToPartMatching(matchedIdx);
95+
jetsDetToPartMatching(matchedIdx, -1);
9696
}
9797

9898
// match MC to rec
@@ -138,7 +138,7 @@ struct JetMatchingHF {
138138
}
139139
}
140140
}
141-
jetsPartToDetMatching(matchedIdx);
141+
jetsPartToDetMatching(matchedIdx, -1);
142142
}
143143
}
144144
};

‎PWGJE/Tasks/jetmatchinghfqa.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ using namespace o2::framework;
2727
using namespace o2::framework::expressions;
2828

2929
struct JetMatchingHFQA {
30-
using DetectorLevelJets = soa::Join<aod::MCDetectorLevelD0Jets, aod::MCDetectorLevelD0JetConstituents, aod::MatchedMCDetectorParticleLevelD0Jets>;
31-
using ParticleLevelJets = soa::Join<aod::MCParticleLevelD0Jets, aod::MCParticleLevelD0JetConstituents, aod::MatchedMCParticleDetectorLevelD0Jets>;
30+
using DetectorLevelJets = soa::Join<aod::D0MCDJets, aod::D0MCDJetConstituents, aod::NewMatchedD0MCDJets>;
31+
using ParticleLevelJets = soa::Join<aod::D0MCPJets, aod::D0MCPJetConstituents, aod::NewMatchedD0MCPJets>;
3232

3333
OutputObj<TH2F> hJetPt{"h_jet_pt"};
3434
OutputObj<TH2F> hJetDetaDphi{"h_jet_deta_dphi"};
@@ -61,10 +61,10 @@ struct JetMatchingHFQA {
6161
DetectorLevelJets const& djets, ParticleLevelJets const& pjets)
6262
{
6363
for (const auto& djet : djets) {
64-
if (djet.has_matchedJet() && djet.matchedJetId() >= 0) {
65-
const auto& pjet = djet.matchedJet_as<ParticleLevelJets>();
64+
if (djet.has_matchedJetCand() && djet.matchedJetCandId() >= 0) {
65+
const auto& pjet = djet.matchedJetCand_as<ParticleLevelJets>();
6666
LOGF(info, "djet %d (pt of %g GeV/c) is matched to %d (pt of %g GeV/c)",
67-
djet.globalIndex(), djet.pt(), djet.matchedJetId(), pjet.pt());
67+
djet.globalIndex(), djet.pt(), djet.matchedJetCandId(), pjet.pt());
6868
hJetPt->Fill(pjet.pt(), djet.pt());
6969
hJetDetPt->Fill(djet.pt());
7070
hJetDetPhi->Fill(djet.phi());
@@ -81,10 +81,10 @@ struct JetMatchingHFQA {
8181
{
8282
LOGF(info, "analysing MC collision %d", collision.globalIndex());
8383
for (const auto& pjet : pjets) {
84-
if (pjet.has_matchedJet() && pjet.matchedJetId() >= 0) {
85-
const auto& djet = pjet.matchedJet_as<DetectorLevelJets>();
84+
if (pjet.has_matchedJetCand() && pjet.matchedJetCandId() >= 0) {
85+
const auto& djet = pjet.matchedJetCand_as<DetectorLevelJets>();
8686
LOGF(info, "pjet %d (pt of %g GeV/c) is matched to %d (pt of %g GeV/c)",
87-
pjet.globalIndex(), pjet.pt(), pjet.matchedJetId(), djet.pt());
87+
pjet.globalIndex(), pjet.pt(), pjet.matchedJetCandId(), djet.pt());
8888
hJetGenPt->Fill(pjet.pt());
8989
hJetGenPhi->Fill(pjet.phi());
9090
hJetGenEta->Fill(pjet.eta());

‎PWGJE/Tasks/jetsubstructurehf.cxx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ struct JetSubstructureHFTask {
177177
}
178178
PROCESS_SWITCH(JetSubstructureHFTask, processD0Data, "D0 jet substructure on data", false);
179179

180-
void processD0MCD(soa::Join<aod::MCDetectorLevelD0Jets, aod::MCDetectorLevelD0JetConstituents>::iterator const& jet,
180+
void processD0MCD(soa::Join<aod::D0MCDJets, aod::D0MCDJetConstituents>::iterator const& jet,
181181
soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec> const& candidates,
182182
aod::Tracks const& tracks)
183183
{
@@ -189,7 +189,7 @@ struct JetSubstructureHFTask {
189189
}
190190
PROCESS_SWITCH(JetSubstructureHFTask, processD0MCD, "D0 jet substructure on MC detector level", false);
191191

192-
void processD0MCP(soa::Join<aod::MCParticleLevelD0Jets, aod::MCParticleLevelD0JetConstituents>::iterator const& jet,
192+
void processD0MCP(soa::Join<aod::D0MCPJets, aod::D0MCPJetConstituents>::iterator const& jet,
193193
aod::McParticles const& particles)
194194
{
195195
processGenLevel(jet);
@@ -208,7 +208,7 @@ struct JetSubstructureHFTask {
208208
}
209209
PROCESS_SWITCH(JetSubstructureHFTask, processLcData, "Lc jet substructure on data", false);
210210

211-
void processLcMCD(soa::Join<aod::MCDetectorLevelLcJets, aod::MCDetectorLevelLcJetConstituents>::iterator const& jet,
211+
void processLcMCD(soa::Join<aod::LcMCDJets, aod::LcMCDJetConstituents>::iterator const& jet,
212212
soa::Join<aod::HfCand2Prong, aod::HfSelLc, aod::HfCand2ProngMcRec> const& candidates,
213213
aod::Tracks const& tracks)
214214
{
@@ -220,14 +220,14 @@ struct JetSubstructureHFTask {
220220
}
221221
PROCESS_SWITCH(JetSubstructureHFTask, processLcMCD, "Lc jet substructure on MC detector level", false);
222222

223-
void processLcMCP(soa::Join<aod::MCParticleLevelLcJets, aod::MCParticleLevelLcJetConstituents>::iterator const& jet,
223+
void processLcMCP(soa::Join<aod::LcMCPJets, aod::LcMCPJetConstituents>::iterator const& jet,
224224
aod::McParticles const& particles)
225225
{
226226
processGenLevel(jet);
227227
}
228228
PROCESS_SWITCH(JetSubstructureHFTask, processLcMCP, "Lc jet substructure on MC particle level", false);
229229

230-
void processBPlusData(soa::Join<aod::BPlusJets, aod::BPlusJetConstituents>::iterator const& jet,
230+
void processBPlusData(soa::Join<aod::BPlJets, aod::BPlJetConstituents>::iterator const& jet,
231231
soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi> const& candidates,
232232
aod::Tracks const& tracks)
233233
{
@@ -239,7 +239,7 @@ struct JetSubstructureHFTask {
239239
}
240240
PROCESS_SWITCH(JetSubstructureHFTask, processBPlusData, "BPlus jet substructure on data", false);
241241

242-
void processBPlusMCD(soa::Join<aod::MCDetectorLevelBPlusJets, aod::MCDetectorLevelBPlusJetConstituents>::iterator const& jet,
242+
void processBPlusMCD(soa::Join<aod::BPlMCDJets, aod::BPlMCDJetConstituents>::iterator const& jet,
243243
soa::Join<aod::HfCandBplus, aod::HfSelBplusToD0Pi, aod::HfCandBplusMcRec> const& candidates,
244244
aod::Tracks const& tracks)
245245
{
@@ -251,22 +251,22 @@ struct JetSubstructureHFTask {
251251
}
252252
PROCESS_SWITCH(JetSubstructureHFTask, processBPlusMCD, "BPlus jet substructure on MC detector level", false);
253253

254-
void processBPlusMCP(soa::Join<aod::MCParticleLevelBPlusJets, aod::MCParticleLevelBPlusJetConstituents>::iterator const& jet,
254+
void processBPlusMCP(soa::Join<aod::BPlMCPJets, aod::BPlMCPJetConstituents>::iterator const& jet,
255255
aod::McParticles const& particles)
256256
{
257257
processGenLevel(jet);
258258
}
259259
PROCESS_SWITCH(JetSubstructureHFTask, processBPlusMCP, "BPlus jet substructure on MC particle level", false);
260260
};
261261
using JetSubstructureD0 = JetSubstructureHFTask<o2::aod::D0JetSubstructure>;
262-
using MCDetectorLevelJetSubstructureD0 = JetSubstructureHFTask<o2::aod::MCDetectorLevelD0JetSubstructure>;
263-
using MCParticleLevelJetSubstructureD0 = JetSubstructureHFTask<o2::aod::MCParticleLevelD0JetSubstructure>;
262+
using MCDetectorLevelJetSubstructureD0 = JetSubstructureHFTask<o2::aod::D0MCDJetSubstructure>;
263+
using MCParticleLevelJetSubstructureD0 = JetSubstructureHFTask<o2::aod::D0MCPJetSubstructure>;
264264
using JetSubstructureLc = JetSubstructureHFTask<o2::aod::LcJetSubstructure>;
265-
using MCDetectorLevelJetSubstructureLc = JetSubstructureHFTask<o2::aod::MCDetectorLevelLcJetSubstructure>;
266-
using MCParticleLevelJetSubstructureLc = JetSubstructureHFTask<o2::aod::MCParticleLevelLcJetSubstructure>;
267-
using JetSubstructureBPlus = JetSubstructureHFTask<o2::aod::BPlusJetSubstructure>;
268-
using MCDetectorLevelJetSubstructureBPlus = JetSubstructureHFTask<o2::aod::MCDetectorLevelBPlusJetSubstructure>;
269-
using MCParticleLevelJetSubstructureBPlus = JetSubstructureHFTask<o2::aod::MCParticleLevelBPlusJetSubstructure>;
265+
using MCDetectorLevelJetSubstructureLc = JetSubstructureHFTask<o2::aod::LcMCDJetSubstructure>;
266+
using MCParticleLevelJetSubstructureLc = JetSubstructureHFTask<o2::aod::LcMCPJetSubstructure>;
267+
using JetSubstructureBPlus = JetSubstructureHFTask<o2::aod::BPlJetSubstructure>;
268+
using MCDetectorLevelJetSubstructureBPlus = JetSubstructureHFTask<o2::aod::BPlMCDJetSubstructure>;
269+
using MCParticleLevelJetSubstructureBPlus = JetSubstructureHFTask<o2::aod::BPlMCPJetSubstructure>;
270270

271271
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
272272
{

0 commit comments

Comments
 (0)