Skip to content

Commit a74be43

Browse files
nzardoshnzardosh
authored
[PWGHF] Fixing indexing on derived collision tables (#9222)
1 parent edcae75 commit a74be43

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

‎PWGHF/DataModel/DerivedTables.h‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -85,30 +85,30 @@ DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! original global index of
8585
o2::soa::Marker<Marker##_hf_type_>);
8686

8787
// Defines the mc collision table
88-
#define DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
89-
namespace hf_mc_coll \
90-
{ \
91-
namespace der_##_hf_namespace_ \
92-
{ \
93-
DECLARE_SOA_ARRAY_INDEX_COLUMN(Hf##_hf_type_##CollBase, hfCollBases); \
94-
} \
95-
} \
96-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollBases, "HF" _hf_description_ "MCCOLLBASE", \
97-
o2::soa::Index<>, \
98-
mccollision::PosX, \
99-
mccollision::PosY, \
100-
mccollision::PosZ, \
101-
cent::CentFT0M, \
102-
o2::soa::Marker<Marker##_hf_type_>); \
103-
\
104-
using Hf##_hf_type_##McCollBase = Hf##_hf_type_##McCollBases::iterator; \
105-
using StoredHf##_hf_type_##McCollBase = StoredHf##_hf_type_##McCollBases::iterator; \
106-
\
107-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollIds, "HF" _hf_description_ "MCCOLLID", \
108-
hf_mc_coll::McCollisionId, \
109-
o2::soa::Marker<Marker##_hf_type_>); \
110-
\
111-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID", \
88+
#define DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
89+
namespace hf_mc_coll \
90+
{ \
91+
namespace der_##_hf_namespace_ \
92+
{ \
93+
DECLARE_SOA_ARRAY_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBases, "HF" _hf_description_ "COLLBASES"); \
94+
} \
95+
} \
96+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollBases, "HF" _hf_description_ "MCCOLLBASE", \
97+
o2::soa::Index<>, \
98+
mccollision::PosX, \
99+
mccollision::PosY, \
100+
mccollision::PosZ, \
101+
cent::CentFT0M, \
102+
o2::soa::Marker<Marker##_hf_type_>); \
103+
\
104+
using Hf##_hf_type_##McCollBase = Hf##_hf_type_##McCollBases::iterator; \
105+
using StoredHf##_hf_type_##McCollBase = StoredHf##_hf_type_##McCollBases::iterator; \
106+
\
107+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollIds, "HF" _hf_description_ "MCCOLLID", \
108+
hf_mc_coll::McCollisionId, \
109+
o2::soa::Marker<Marker##_hf_type_>); \
110+
\
111+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID", \
112112
hf_mc_coll::der_##_hf_namespace_::Hf##_hf_type_##CollBaseIds);
113113

114114
#define DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
@@ -161,27 +161,27 @@ DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int8_t); //! particle
161161
DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant decay channel flag, generator level
162162
} // namespace hf_mc_particle
163163

164-
#define DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
165-
namespace hf_cand_base \
166-
{ \
167-
namespace der_##_hf_namespace_ \
168-
{ \
169-
DECLARE_SOA_INDEX_COLUMN(Hf##_hf_type_##CollBase, hfCollBase); \
170-
} \
171-
} \
172-
\
173-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Bases, "HF" _hf_description_ "BASE", \
174-
o2::soa::Index<>, \
175-
hf_cand_base::der_##_hf_namespace_::Hf##_hf_type_##CollBaseId, \
176-
hf_cand_base::Pt, \
177-
hf_cand_base::Eta, \
178-
hf_cand_base::Phi, \
179-
hf_cand_base::M, \
180-
hf_cand_base::Y, \
181-
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
182-
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
183-
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
184-
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
164+
#define DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
165+
namespace hf_cand_base \
166+
{ \
167+
namespace der_##_hf_namespace_ \
168+
{ \
169+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBase, "HF" _hf_description_ "COLLBASES"); \
170+
} \
171+
} \
172+
\
173+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Bases, "HF" _hf_description_ "BASE", \
174+
o2::soa::Index<>, \
175+
hf_cand_base::der_##_hf_namespace_::Hf##_hf_type_##CollBaseId, \
176+
hf_cand_base::Pt, \
177+
hf_cand_base::Eta, \
178+
hf_cand_base::Phi, \
179+
hf_cand_base::M, \
180+
hf_cand_base::Y, \
181+
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
182+
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
183+
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
184+
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
185185
o2::soa::Marker<Marker##_hf_type_>);
186186

187187
#define DECLARE_CAND_2P_ID_TABLE(_hf_type_, _hf_description_) \
@@ -204,27 +204,27 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
204204
hf_cand_sel::CandidateSelFlag, \
205205
o2::soa::Marker<Marker##_hf_type_>);
206206

207-
#define DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
208-
namespace hf_mc_particle \
209-
{ \
210-
namespace der_##_hf_namespace_ \
211-
{ \
212-
DECLARE_SOA_INDEX_COLUMN(Hf##_hf_type_##McCollBase, hfMcCollBase); \
213-
} \
214-
} \
215-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PBases, "HF" _hf_description_ "PBASE", \
216-
o2::soa::Index<>, \
217-
hf_mc_particle::der_##_hf_namespace_::Hf##_hf_type_##McCollBaseId, \
218-
hf_cand_base::Pt, \
219-
hf_cand_base::Eta, \
220-
hf_cand_base::Phi, \
221-
hf_cand_base::Y, \
222-
hf_mc_particle::FlagMcMatchGen, \
223-
hf_mc_particle::OriginMcGen, \
224-
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
225-
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
226-
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
227-
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
207+
#define DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
208+
namespace hf_mc_particle \
209+
{ \
210+
namespace der_##_hf_namespace_ \
211+
{ \
212+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##McCollBase, hfMcCollBase, "HF" _hf_description_ "MCCOLLBASES"); \
213+
} \
214+
} \
215+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PBases, "HF" _hf_description_ "PBASE", \
216+
o2::soa::Index<>, \
217+
hf_mc_particle::der_##_hf_namespace_::Hf##_hf_type_##McCollBaseId, \
218+
hf_cand_base::Pt, \
219+
hf_cand_base::Eta, \
220+
hf_cand_base::Phi, \
221+
hf_cand_base::Y, \
222+
hf_mc_particle::FlagMcMatchGen, \
223+
hf_mc_particle::OriginMcGen, \
224+
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
225+
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
226+
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
227+
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
228228
o2::soa::Marker<Marker##_hf_type_>);
229229

230230
#define DECLARE_MCCAND_ID_TABLE(_hf_type_, _hf_description_) \

0 commit comments

Comments
 (0)