Skip to content

Commit 377dd15

Browse files
qgpqgp
committed
Update jet tables
1 parent d376294 commit 377dd15

2 files changed

Lines changed: 116 additions & 87 deletions

File tree

‎PWGJE/DataModel/Jet.h‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@
5757
} \
5858
DECLARE_SOA_TABLE(Matched##_jet_type_##s, "AOD", _description_ "MATCH", \
5959
_name_##matching::_jet_type_##Id, \
60-
_name_##matching::MatchedJetIndex);
60+
_name_##matching::MatchedJetIndex); \
61+
namespace _name_##matchingGeo \
62+
{ \
63+
DECLARE_SOA_INDEX_COLUMN(_jet_type_, matchedJetGeo); \
64+
} \
65+
namespace _name_##matchingCand \
66+
{ \
67+
DECLARE_SOA_INDEX_COLUMN(_jet_type_, matchedJetCand); \
68+
}
6169

6270
// Defines the jet constituent table
6371
#define JET_CONSTITUENTS_TABLE_DEF(_jet_type_, _name_, _Description_, _track_type_) \
@@ -105,6 +113,24 @@
105113
constituentssub::Pz<constituentssub::Pt, constituentssub::Eta>, \
106114
constituentssub::P<constituentssub::Pt, constituentssub::Eta>);
107115

116+
// combine definition of tables for jets, constituents, and substructure
117+
#define JET_TABLES_DEF(_collision_name_, _jet_type_, _const_type_, _hfcand_type_) \
118+
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, #_jet_type_ "JET"); \
119+
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
120+
using Matched##_jet_type_##Jet = Matched##_jet_type_##Jet##s::iterator; \
121+
JET_CONSTITUENTS_ARRAY_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, #_jet_type_, _const_type_, _hfcand_type_); \
122+
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
123+
JET_CONSTITUENTS_SUB_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, #_jet_type_); \
124+
using _jet_type_##Jet##ConstituentSub = _jet_type_##Jet##ConstituentsSub::iterator;
125+
126+
// generate tables for data, generator- and detector-level jets
127+
#define JET_TABLES_LEVELS_DEF(_jet_type_, _hfcand_type_) \
128+
JET_TABLES_DEF(Collision, _jet_type_, Track, _hfcand_type_); \
129+
JET_TABLES_DEF(Collision, _jet_type_##MCD, Track, _hfcand_type_); \
130+
JET_TABLES_DEF(McCollision, _jet_type_##MCP, McParticle, McParticles); \
131+
DECLARE_SOA_TABLE(NewMatched##_jet_type_##MCPJets, "AOD", #_jet_type_ "JETMATCH", _jet_type_##MCDjetmatchingGeo::_jet_type_##MCDJetId, _jet_type_##MCDjetmatchingCand::_jet_type_##MCDJetId); \
132+
DECLARE_SOA_TABLE(NewMatched##_jet_type_##MCDJets, "AOD", #_jet_type_ "JETMATCH", _jet_type_##MCPjetmatchingGeo::_jet_type_##MCPJetId, _jet_type_##MCPjetmatchingCand::_jet_type_##MCPJetId);
133+
108134
namespace o2::aod
109135
{
110136
namespace jet

‎PWGJE/DataModel/JetHF.h‎

Lines changed: 89 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -28,98 +28,101 @@ namespace o2::aod
2828

2929
// HF jets
3030
// D0 tagged jets
31-
JET_TABLE_DEF(Collision, D0Jet, D0jet, "D0JET");
32-
using D0Jet = D0Jets::iterator;
33-
using MatchedD0Jet = MatchedD0Jets::iterator;
34-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(D0Jet, D0jet, "D0", Track, HfCand2Prong);
35-
using D0JetConstituent = D0JetConstituents::iterator;
36-
JET_CONSTITUENTS_SUB_TABLE_DEF(D0Jet, D0jet, "D0");
37-
using D0JetConstituentSub = D0JetConstituentsSub::iterator;
38-
39-
// Lc tagged jets
40-
JET_TABLE_DEF(Collision, LcJet, Lcjet, "LcJET");
41-
using LcJet = LcJets::iterator;
42-
using MatchedLcJet = MatchedLcJets::iterator;
43-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(LcJet, Lcjet, "Lc", Track, HfCand3Prong);
44-
using LcJetConstituent = LcJetConstituents::iterator;
45-
JET_CONSTITUENTS_SUB_TABLE_DEF(LcJet, Lcjet, "Lc");
46-
using LcJetConstituentSub = LcJetConstituentsSub::iterator;
47-
48-
// B+ tagged jets
49-
JET_TABLE_DEF(Collision, BPlusJet, BPlusjet, "BPlJET");
50-
using BPlusJet = BPlusJets::iterator;
51-
using MatchedBPlusJet = MatchedBPlusJets::iterator;
52-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(BPlusJet, BPlusjet, "BPl", Track, HfCandBplus);
53-
using BPlusJetConstituent = BPlusJetConstituents::iterator;
54-
JET_CONSTITUENTS_SUB_TABLE_DEF(BPlusJet, BPlusjet, "BPl");
55-
using BPlusJetConstituentSub = BPlusJetConstituentsSub::iterator;
31+
JET_TABLES_LEVELS_DEF(D0, HfCand2Prong);
32+
JET_TABLES_LEVELS_DEF(Lc, HfCand3Prong);
33+
JET_TABLES_LEVELS_DEF(BPl, HfCandBplus);
34+
35+
// using D0Jet = D0Jets::iterator;
36+
// using MatchedD0Jet = MatchedD0Jets::iterator;
37+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(D0Jet, D0jet, "D0", Track, HfCand2Prong);
38+
// using D0JetConstituent = D0JetConstituents::iterator;
39+
// JET_CONSTITUENTS_SUB_TABLE_DEF(D0Jet, D0jet, "D0");
40+
// using D0JetConstituentSub = D0JetConstituentsSub::iterator;
41+
42+
// // Lc tagged jets
43+
// JET_TABLE_DEF(Collision, LcJet, Lcjet, "LcJET");
44+
// using LcJet = LcJets::iterator;
45+
// using MatchedLcJet = MatchedLcJets::iterator;
46+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(LcJet, Lcjet, "Lc", Track, HfCand3Prong);
47+
// using LcJetConstituent = LcJetConstituents::iterator;
48+
// JET_CONSTITUENTS_SUB_TABLE_DEF(LcJet, Lcjet, "Lc");
49+
// using LcJetConstituentSub = LcJetConstituentsSub::iterator;
50+
51+
// // B+ tagged jets
52+
// JET_TABLE_DEF(Collision, BPlusJet, BPlusjet, "BPlJET");
53+
// using BPlusJet = BPlusJets::iterator;
54+
// using MatchedBPlusJet = MatchedBPlusJets::iterator;
55+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(BPlusJet, BPlusjet, "BPl", Track, HfCandBplus);
56+
// using BPlusJetConstituent = BPlusJetConstituents::iterator;
57+
// JET_CONSTITUENTS_SUB_TABLE_DEF(BPlusJet, BPlusjet, "BPl");
58+
// using BPlusJetConstituentSub = BPlusJetConstituentsSub::iterator;
5659

5760
// HF jets (MC detector level)
5861
// D0 tagged jets
59-
JET_TABLE_DEF(Collision, MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0JETMCD");
60-
using MCDetectorLevelD0Jet = MCDetectorLevelD0Jets::iterator;
61-
using MatchedMCDetectorLevelD0Jet = MatchedMCDetectorLevelD0Jets::iterator;
62-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0MCD", Track, HfCand2Prong);
63-
using MCDetectorLevelD0JetConstituent = MCDetectorLevelD0JetConstituents::iterator;
64-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0MCD");
65-
using MCDetectorLevelD0JetConstituentSub = MCDetectorLevelD0JetConstituentsSub::iterator;
66-
67-
// Lc tagged jets
68-
JET_TABLE_DEF(Collision, MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcJETMCD");
69-
using MCDetectorLevelLcJet = MCDetectorLevelLcJets::iterator;
70-
using MatchedMCDetectorLevelLcJet = MatchedMCDetectorLevelLcJets::iterator;
71-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcMCD", Track, HfCand3Prong);
72-
using MCDetectorLevelLcJetConstituent = MCDetectorLevelLcJetConstituents::iterator;
73-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcMCD");
74-
using MCDetectorLevelLcJetConstituentSub = MCDetectorLevelLcJetConstituentsSub::iterator;
75-
76-
// B+ tagged jets
77-
JET_TABLE_DEF(Collision, MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlJETMCD");
78-
using MCDetectorLevelBPlusJet = MCDetectorLevelBPlusJets::iterator;
79-
using MatchedMCDetectorLevelBPlusJet = MatchedMCDetectorLevelBPlusJets::iterator;
80-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlMCD", Track, HfCandBplus);
81-
using MCDetectorLevelBPlusJetConstituent = MCDetectorLevelBPlusJetConstituents::iterator;
82-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlMCD");
83-
using MCDetectorLevelBPlusJetConstituentSub = MCDetectorLevelBPlusJetConstituentsSub::iterator;
62+
// JET_TABLE_DEF(Collision, MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0JETMCD");
63+
// using MCDetectorLevelD0Jet = MCDetectorLevelD0Jets::iterator;
64+
// using MatchedMCDetectorLevelD0Jet = MatchedMCDetectorLevelD0Jets::iterator;
65+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0MCD", Track, HfCand2Prong);
66+
// using MCDetectorLevelD0JetConstituent = MCDetectorLevelD0JetConstituents::iterator;
67+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelD0Jet, mcdetectorlevelD0jet, "D0MCD");
68+
// using MCDetectorLevelD0JetConstituentSub = MCDetectorLevelD0JetConstituentsSub::iterator;
69+
70+
// // Lc tagged jets
71+
// JET_TABLE_DEF(Collision, MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcJETMCD");
72+
// using MCDetectorLevelLcJet = MCDetectorLevelLcJets::iterator;
73+
// using MatchedMCDetectorLevelLcJet = MatchedMCDetectorLevelLcJets::iterator;
74+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcMCD", Track, HfCand3Prong);
75+
// using MCDetectorLevelLcJetConstituent = MCDetectorLevelLcJetConstituents::iterator;
76+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelLcJet, mcdetectorlevelLcjet, "LcMCD");
77+
// using MCDetectorLevelLcJetConstituentSub = MCDetectorLevelLcJetConstituentsSub::iterator;
78+
79+
// // B+ tagged jets
80+
// JET_TABLE_DEF(Collision, MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlJETMCD");
81+
// using MCDetectorLevelBPlusJet = MCDetectorLevelBPlusJets::iterator;
82+
// using MatchedMCDetectorLevelBPlusJet = MatchedMCDetectorLevelBPlusJets::iterator;
83+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlMCD", Track, HfCandBplus);
84+
// using MCDetectorLevelBPlusJetConstituent = MCDetectorLevelBPlusJetConstituents::iterator;
85+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelBPlusJet, mcdetectorlevelBPlusjet, "BPlMCD");
86+
// using MCDetectorLevelBPlusJetConstituentSub = MCDetectorLevelBPlusJetConstituentsSub::iterator;
8487

8588
// HF jets (MC particle level)
8689
// D0 tagged jets
87-
JET_TABLE_DEF(McCollision, MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0JETMCP");
88-
using MCParticleLevelD0Jet = MCParticleLevelD0Jets::iterator;
89-
using MatchedMCParticleLevelD0Jet = MatchedMCParticleLevelD0Jets::iterator;
90-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0MCP", McParticle, McParticles);
91-
using MCParticleLevelD0JetConstituent = MCParticleLevelD0JetConstituents::iterator;
92-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0MCP");
93-
using MCParticleLevelD0JetConstituentSub = MCParticleLevelD0JetConstituentsSub::iterator;
94-
95-
// Lc tagged jets
96-
JET_TABLE_DEF(McCollision, MCParticleLevelLcJet, mcparticlelevelLcjet, "LcJETMCP");
97-
using MCParticleLevelLcJet = MCParticleLevelLcJets::iterator;
98-
using MatchedMCParticleLevelLcJet = MatchedMCParticleLevelLcJets::iterator;
99-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcMCP", McParticle, McParticles);
100-
using MCParticleLevelLcJetConstituent = MCParticleLevelLcJetConstituents::iterator;
101-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcMCP");
102-
using MCParticleLevelLcJetConstituentSub = MCParticleLevelLcJetConstituentsSub::iterator;
103-
104-
// B+ tagged jets
105-
JET_TABLE_DEF(McCollision, MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlJETMCP");
106-
using MCParticleLevelBPlusJet = MCParticleLevelBPlusJets::iterator;
107-
using MatchedMCParticleLevelBPlusJet = MatchedMCParticleLevelBPlusJets::iterator;
108-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlMCP", McParticle, McParticles);
109-
using MCParticleLevelBPlusJetConstituent = MCParticleLevelBPlusJetConstituents::iterator;
110-
JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlMCP");
111-
using MCParticleLevelBPlusJetConstituentSub = MCParticleLevelBPlusJetConstituentsSub::iterator;
112-
113-
namespace mcdetectorlevelD0jetmatching2
114-
{
115-
DECLARE_SOA_INDEX_COLUMN(MCDetectorLevelD0Jet, matchedJet);
116-
}
117-
namespace mcparticlelevelD0jetmatching2
118-
{
119-
DECLARE_SOA_INDEX_COLUMN(MCParticleLevelD0Jet, matchedJet);
120-
}
121-
DECLARE_SOA_TABLE(MatchedMCParticleDetectorLevelD0Jets, "AOD", "D0JETMCPDMATCH", mcdetectorlevelD0jetmatching2::MCDetectorLevelD0JetId);
122-
DECLARE_SOA_TABLE(MatchedMCDetectorParticleLevelD0Jets, "AOD", "D0JETMCDPMATCH", mcparticlelevelD0jetmatching2::MCParticleLevelD0JetId);
90+
// JET_TABLE_DEF(McCollision, MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0JETMCP");
91+
// using MCParticleLevelD0Jet = MCParticleLevelD0Jets::iterator;
92+
// using MatchedMCParticleLevelD0Jet = MatchedMCParticleLevelD0Jets::iterator;
93+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0MCP", McParticle, McParticles);
94+
// using MCParticleLevelD0JetConstituent = MCParticleLevelD0JetConstituents::iterator;
95+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelD0Jet, mcparticlelevelD0jet, "D0MCP");
96+
// using MCParticleLevelD0JetConstituentSub = MCParticleLevelD0JetConstituentsSub::iterator;
97+
98+
// // Lc tagged jets
99+
// JET_TABLE_DEF(McCollision, MCParticleLevelLcJet, mcparticlelevelLcjet, "LcJETMCP");
100+
// using MCParticleLevelLcJet = MCParticleLevelLcJets::iterator;
101+
// using MatchedMCParticleLevelLcJet = MatchedMCParticleLevelLcJets::iterator;
102+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcMCP", McParticle, McParticles);
103+
// using MCParticleLevelLcJetConstituent = MCParticleLevelLcJetConstituents::iterator;
104+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelLcJet, mcparticlelevelLcjet, "LcMCP");
105+
// using MCParticleLevelLcJetConstituentSub = MCParticleLevelLcJetConstituentsSub::iterator;
106+
107+
// // B+ tagged jets
108+
// JET_TABLE_DEF(McCollision, MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlJETMCP");
109+
// using MCParticleLevelBPlusJet = MCParticleLevelBPlusJets::iterator;
110+
// using MatchedMCParticleLevelBPlusJet = MatchedMCParticleLevelBPlusJets::iterator;
111+
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlMCP", McParticle, McParticles);
112+
// using MCParticleLevelBPlusJetConstituent = MCParticleLevelBPlusJetConstituents::iterator;
113+
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelBPlusJet, mcparticlelevelBPlusjet, "BPlMCP");
114+
// using MCParticleLevelBPlusJetConstituentSub = MCParticleLevelBPlusJetConstituentsSub::iterator;
115+
116+
// namespace mcdetectorlevelD0jetmatching2
117+
// {
118+
// DECLARE_SOA_INDEX_COLUMN(MCDetectorLevelD0Jet, matchedJet);
119+
// }
120+
// namespace mcparticlelevelD0jetmatching2
121+
// {
122+
// DECLARE_SOA_INDEX_COLUMN(MCParticleLevelD0Jet, matchedJet);
123+
// }
124+
// DECLARE_SOA_TABLE(MatchedMCParticleDetectorLevelD0Jets, "AOD", "D0JETMCPDMATCH", mcdetectorlevelD0jetmatching2::MCDetectorLevelD0JetId);
125+
// DECLARE_SOA_TABLE(MatchedMCDetectorParticleLevelD0Jets, "AOD", "D0JETMCDPMATCH", mcparticlelevelD0jetmatching2::MCParticleLevelD0JetId);
123126

124127
} // namespace o2::aod
125128

0 commit comments

Comments
 (0)