Skip to content

Commit b62fe72

Browse files
qgpqgp
committed
Cleanup
1 parent 71a85fd commit b62fe72

1 file changed

Lines changed: 3 additions & 114 deletions

File tree

‎PWGJE/DataModel/Jet.h‎

Lines changed: 3 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
9696
jet::Pz<jet::Pt, jet::Eta>, \
9797
jet::P<jet::Pt, jet::Eta>, \
9898
_name_##util::Dummy##_jet_type_##s<>); \
99-
namespace _name_##matching \
100-
{ \
101-
DECLARE_SOA_INDEX_COLUMN(_jet_type_, jet); \
102-
DECLARE_SOA_COLUMN(MatchedJetIndex, matchedJetIndex, int); \
103-
} \
104-
DECLARE_SOA_TABLE(Matched##_jet_type_##s, "AOD", _description_ "MATCH", \
105-
_name_##matching::_jet_type_##Id, \
106-
_name_##matching::MatchedJetIndex); \
10799
namespace _name_##matchingGeo \
108100
{ \
109101
DECLARE_SOA_INDEX_COLUMN(_jet_type_, matchedJetGeo); \
@@ -148,7 +140,6 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
148140
#define DECLARE_JET_TABLES(_collision_name_, _jet_type_, _const_type_, _hfcand_type_, _description_) \
149141
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, _description_); \
150142
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
151-
using Matched##_jet_type_##Jet = Matched##_jet_type_##Jet##s::iterator; \
152143
JET_CONSTITUENTS_ARRAY_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, _description_, _const_type_, _hfcand_type_); \
153144
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
154145
JET_CONSTITUENTS_SUB_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, _description_); \
@@ -157,7 +148,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
157148
#define DECLARE_JETMATCHING_TABLE(_jet_type_base_, _jet_type_tag_, _description_) \
158149
DECLARE_SOA_TABLE(_jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jets, "AOD", _description_, \
159150
_jet_type_tag_##jetmatchingGeo::_jet_type_tag_##JetId, \
160-
_jet_type_tag_##jetmatchingCand::_jet_type_tag_##JetId);
151+
_jet_type_tag_##jetmatchingCand::_jet_type_tag_##JetId); \
152+
using _jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jet = _jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jets::iterator;
161153

162154
// generate tables for data-, detector- and particle-level jets
163155
#define DECLARE_JET_TABLES_LEVELS(_jet_type_, _hfcand_type_, _shortname_) \
@@ -176,118 +168,15 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
176168

177169
namespace o2::aod
178170
{
179-
// Data jets charged
180-
// DECLARE_JET_TABLES(Collision, , Track, HfCand2Prong);
181-
// DECLARE_JET_TABLES(Collision, Full, Track, HfCand2Prong);
182-
// DECLARE_JET_TABLES(Collision, Neutral, Track, HfCand2Prong);
183-
184171
DECLARE_JET_TABLES_LEVELS(, HfCand2Prong, "");
185172
DECLARE_JET_TABLES_LEVELS(Full, HfCand2Prong, "F");
186173
DECLARE_JET_TABLES_LEVELS(Neutral, HfCand2Prong, "N");
187174
DECLARE_JET_TABLES_LEVELS2(D0, HfCand2Prong, "D0");
188175
DECLARE_JET_TABLES_LEVELS2(Lc, HfCand3Prong, "Lc");
189176
DECLARE_JET_TABLES_LEVELS2(BPl, HfCandBplus, "BPl");
190177

191-
// JET_TABLE_DEF(Collision, Jet, jet, "JET");
192-
// using Jet = Jets::iterator;
193-
// using MatchedJet = MatchedJets::iterator;
194-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(Jet, jet, "JET", Track, HfCand2Prong);
195-
// using JetConstituent = JetConstituents::iterator;
196-
// JET_CONSTITUENTS_SUB_TABLE_DEF(Jet, jet, "JET");
197-
// using JetConstituentSub = JetConstituentsSub::iterator;
198-
199-
// Data jets full
200-
// JET_TABLE_DEF(Collision, FullJet, fulljet, "JETF");
201-
// using FullJet = FullJets::iterator;
202-
// using MatchedFullJet = MatchedFullJets::iterator;
203-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(FullJet, fulljet, "JETF", Track, HfCand2Prong);
204-
// using FullJetConstituent = FullJetConstituents::iterator;
205-
// JET_CONSTITUENTS_SUB_TABLE_DEF(FullJet, fulljet, "JETF");
206-
// using FullJetConstituentSub = FullJetConstituentsSub::iterator;
207-
208-
// // Data jets neutral
209-
// JET_TABLE_DEF(Collision, NeutralJet, neutraljet, "JETN");
210-
// using NeutralJet = NeutralJets::iterator;
211-
// using MatchedNeutralJet = MatchedNeutralJets::iterator;
212-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(NeutralJet, neutraljet, "JETN", Track, HfCand2Prong);
213-
// using NeutralJetConstituent = NeutralJetConstituents::iterator;
214-
// JET_CONSTITUENTS_SUB_TABLE_DEF(NeutralJet, neutraljet, "JETN");
215-
// using NeutralJetConstituentSub = NeutralJetConstituentsSub::iterator;
216-
217-
// MC Detector Level charged Jets
218-
// NOTE: The same condition as describe for particle leve jets also applies here
219-
// to subtracted constituents.
220-
221-
// JET_TABLE_DEF(Collision, MCDetectorLevelJet, mcdetectorleveljet, "JETMCDET");
222-
// using MCDetectorLevelJet = MCDetectorLevelJets::iterator;
223-
// using MatchedMCDetectorLevelJet = MatchedMCDetectorLevelJets::iterator;
224-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelJet, mcdetectorleveljet, "MCD", Track, HfCand2Prong);
225-
// using MCDetectorLevelJetConstituent = MCDetectorLevelJetConstituents::iterator;
226-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelJet, mcdetectorleveljet, "MCD");
227-
// using MCDetectorLevelJetConstituentSub = MCDetectorLevelJetConstituentsSub::iterator;
228-
229-
// // MC Detector Level full Jets
230-
// JET_TABLE_DEF(Collision, MCDetectorLevelFullJet, mcdetectorlevelfulljet, "JETFMCDET");
231-
// using MCDetectorLevelFullJet = MCDetectorLevelFullJets::iterator;
232-
// using MatchedMCDetectorLevelFullJet = MatchedMCDetectorLevelFullJets::iterator;
233-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelFullJet, mcdetectorlevelfulljet, "MCDF", Track, HfCand2Prong);
234-
// using MCDetectorLevelFullJetConstituent = MCDetectorLevelFullJetConstituents::iterator;
235-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelFullJet, mcdetectorlevelfulljet, "MCDF");
236-
// using MCDetectorLevelFullJetConstituentSub = MCDetectorLevelFullJetConstituentsSub::iterator;
237-
238-
// // MC Detector Level neutral Jets
239-
// JET_TABLE_DEF(Collision, MCDetectorLevelNeutralJet, mcdetectorlevelneutraljet, "JETNMCDET");
240-
// using MCDetectorLevelNeutralJet = MCDetectorLevelNeutralJets::iterator;
241-
// using MatchedMCDetectorLevelNeutralJet = MatchedMCDetectorLevelNeutralJets::iterator;
242-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCDetectorLevelNeutralJet, mcdetectorlevelneutraljet, "MCDN", Track, HfCand2Prong);
243-
// using MCDetectorLevelNeutralJetConstituent = MCDetectorLevelNeutralJetConstituents::iterator;
244-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCDetectorLevelNeutralJet, mcdetectorlevelneutraljet, "MCDN");
245-
// using MCDetectorLevelNeutralJetConstituentSub = MCDetectorLevelNeutralJetConstituentsSub::iterator;
246-
247-
// // MC Particle Level Jets
248-
// // NOTE: Cluster constituents aren't really meaningful for particle level.
249-
// // However, it's a convenient construction, as it allows everything else
250-
// // to work as it would otherwise, and it won't be filled (because there
251-
// // are no clusters and nothing that would be identified as clusters), so
252-
// // it causes no harm. Perhaps better would be making this std::optional,
253-
// // but for now, we keep it simple.
254-
// // NOTE: The same condition applies to subtracted constituents.
255-
// // MC Particle Level charged Jets
256-
// JET_TABLE_DEF(McCollision, MCParticleLevelJet, mcparticleleveljet, "JETMCPART");
257-
// using MCParticleLevelJet = MCParticleLevelJets::iterator;
258-
// using MatchedMCParticleLevelJet = MatchedMCParticleLevelJets::iterator;
259-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelJet, mcparticleleveljet, "MCP", McParticle, McParticles);
260-
// using MCParticleLevelJetConstituent = MCParticleLevelJetConstituents::iterator;
261-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelJet, mcparticleleveljet, "MCP");
262-
// using MCParticleLevelJetConstituentSub = MCParticleLevelJetConstituentsSub::iterator;
263-
264-
// // MC Particle Level full
265-
// JET_TABLE_DEF(McCollision, MCParticleLevelFullJet, mcparticlelevelfulljet, "JETFMCPART");
266-
// using MCParticleLevelFullJet = MCParticleLevelFullJets::iterator;
267-
// using MatchedMCParticleLevelFullJet = MatchedMCParticleLevelFullJets::iterator;
268-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelFullJet, mcparticlelevelfulljet, "MCPF", McParticle, McParticles);
269-
// using MCParticleLevelFullJetConstituent = MCParticleLevelFullJetConstituents::iterator;
270-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelFullJet, mcparticlelevelfulljet, "MCPF");
271-
// using MCParticleLevelFullJetConstituentSub = MCParticleLevelFullJetConstituentsSub::iterator;
272-
273-
// // MC Particle Level neutral Jets
274-
// JET_TABLE_DEF(McCollision, MCParticleLevelNeutralJet, mcparticlelevelneutraljet, "JETNMCPART");
275-
// using MCParticleLevelNeutralJet = MCParticleLevelNeutralJets::iterator;
276-
// using MatchedMCParticleLevelNeutralJet = MatchedMCParticleLevelNeutralJets::iterator;
277-
// JET_CONSTITUENTS_ARRAY_TABLE_DEF(MCParticleLevelNeutralJet, mcparticlelevelneutraljet, "MCPN", McParticle, McParticles);
278-
// using MCParticleLevelNeutralJetConstituent = MCParticleLevelNeutralJetConstituents::iterator;
279-
// JET_CONSTITUENTS_SUB_TABLE_DEF(MCParticleLevelNeutralJet, mcparticlelevelneutraljet, "MCPN");
280-
// using MCParticleLevelNeutralJetConstituentSub = MCParticleLevelNeutralJetConstituentsSub::iterator;
281-
282178
// Hybrid intermediate
283-
JET_TABLE_DEF(Collision, HybridIntermediateJet, hybridintermediatejet, "JETHYBINT");
284-
using HybridIntermediateJet = HybridIntermediateJets::iterator;
285-
using MatchedHybridIntermediateJet = MatchedHybridIntermediateJets::iterator;
286-
JET_CONSTITUENTS_ARRAY_TABLE_DEF(HybridIntermediateJet, hybridintermediate, "HYBINT", Track, HfCand2Prong);
287-
using HybridIntermediateJetConstituent = HybridIntermediateJetConstituents::iterator;
288-
JET_CONSTITUENTS_SUB_TABLE_DEF(HybridIntermediateJet, hybridintermediate, "HYBINT");
289-
using HybridIntermediateJetConstituentSub = HybridIntermediateJetConstituentsSub::iterator;
290-
179+
DECLARE_JET_TABLES(Collision, HybridIntermediate, Track, HfCand2Prong, "JEHYIN");
291180
} // namespace o2::aod
292181

293182
#endif // PWGJE_DATAMODEL_JET_H_

0 commit comments

Comments
 (0)