Skip to content

Commit 41c5a2c

Browse files
vkuceravkucera
authored
[PWGHF] Simplify derived-data macros (#9847)
1 parent be38c49 commit 41c5a2c

File tree

1 file changed

+25
-36
lines changed

1 file changed

+25
-36
lines changed

‎PWGHF/DataModel/DerivedTables.h‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! original global index of
6464
} // namespace hf_mc_coll
6565

6666
// Declares the base table with reconstructed collisions (CollBases) and joinable tables (CollIds).
67-
#define DECLARE_COLL_TABLE(_hf_type_, _hf_description_) \
67+
#define DECLARE_TABLES_COLL(_hf_type_, _hf_description_) \
6868
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##CollBases, "HF" _hf_description_ "COLLBASE", \
6969
o2::soa::Index<>, \
7070
collision::PosX, \
@@ -86,7 +86,7 @@ DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! original global index of
8686
o2::soa::Marker<Marker##_hf_type_>);
8787

8888
// Declares the base table with MC collisions (McCollBases) and joinable tables (McCollIds, McRCollIds).
89-
#define DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
89+
#define DECLARE_TABLES_MCCOLL(_hf_type_, _hf_description_, _hf_namespace_) \
9090
namespace hf_mc_coll \
9191
{ \
9292
namespace der_##_hf_namespace_ \
@@ -112,11 +112,6 @@ DECLARE_SOA_INDEX_COLUMN(McCollision, mcCollision); //! original global index of
112112
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID", \
113113
hf_mc_coll::der_##_hf_namespace_::Hf##_hf_type_##CollBaseIds);
114114

115-
// Declares all tables with reconstructed and MC collisions.
116-
#define DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
117-
DECLARE_COLL_TABLE(_hf_type_, _hf_description_) \
118-
DECLARE_MCCOLL_TABLE(_hf_type_, _hf_description_, _hf_namespace_)
119-
120115
// ================
121116
// Candidate tables
122117
// ================
@@ -168,7 +163,7 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
168163
} // namespace hf_mc_particle
169164

170165
// Declares the base table with candidates (Bases).
171-
#define DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
166+
#define DECLARE_TABLE_CAND_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
172167
namespace hf_cand_base \
173168
{ \
174169
namespace der_##_hf_namespace_ \
@@ -192,15 +187,15 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
192187
o2::soa::Marker<Marker##_hf_type_>);
193188

194189
// Declares the table with global indices for 2-prong candidates (Ids).
195-
#define DECLARE_CAND_2P_ID_TABLE(_hf_type_, _hf_description_) \
190+
#define DECLARE_TABLE_CAND_ID_2P(_hf_type_, _hf_description_) \
196191
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Ids, "HF" _hf_description_ "ID", \
197192
hf_cand::CollisionId, \
198193
hf_track_index::Prong0Id, \
199194
hf_track_index::Prong1Id, \
200195
o2::soa::Marker<Marker##_hf_type_>);
201196

202197
// Declares the table with global indices for 3-prong candidates (Ids).
203-
#define DECLARE_CAND_3P_ID_TABLE(_hf_type_, _hf_description_) \
198+
#define DECLARE_TABLE_CAND_ID_3P(_hf_type_, _hf_description_) \
204199
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Ids, "HF" _hf_description_ "ID", \
205200
hf_cand::CollisionId, \
206201
hf_track_index::Prong0Id, \
@@ -209,7 +204,7 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
209204
o2::soa::Marker<Marker##_hf_type_>);
210205

211206
// Declares the table with candidate selection flags (Sels).
212-
#define DECLARE_CAND_SEL_TABLE(_hf_type_, _hf_description_) \
207+
#define DECLARE_TABLE_CAND_SEL(_hf_type_, _hf_description_) \
213208
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Sels, "HF" _hf_description_ "SEL", \
214209
hf_cand_sel::CandidateSelFlag, \
215210
o2::soa::Marker<Marker##_hf_type_>);
@@ -219,7 +214,7 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
219214
// ================
220215

221216
// Declares the base table with MC particles (PBases).
222-
#define DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
217+
#define DECLARE_TABLE_MCPARTICLE_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
223218
namespace hf_mc_particle \
224219
{ \
225220
namespace der_##_hf_namespace_ \
@@ -243,7 +238,7 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
243238
o2::soa::Marker<Marker##_hf_type_>);
244239

245240
// Declares the table with global indices for MC particles (PIds).
246-
#define DECLARE_MCCAND_ID_TABLE(_hf_type_, _hf_description_) \
241+
#define DECLARE_TABLE_MCPARTICLE_ID(_hf_type_, _hf_description_) \
247242
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PIds, "HF" _hf_description_ "PID", \
248243
hf_mc_particle::McCollisionId, \
249244
hf_mc_particle::McParticleId, \
@@ -253,38 +248,32 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
253248
// Helper macros for combinations
254249
// ================
255250

256-
#define DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
257-
DECLARE_CAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
258-
DECLARE_CAND_SEL_TABLE(_hf_type_, _hf_description_) \
259-
DECLARE_MCCAND_BASE_TABLE(_hf_type_, _hf_description_, _hf_namespace_) \
260-
DECLARE_MCCAND_ID_TABLE(_hf_type_, _hf_description_)
261-
262-
#define DECLARE_CAND_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
263-
DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
264-
DECLARE_CAND_2P_ID_TABLE(_hf_type_, _hf_description_)
265-
266-
#define DECLARE_CAND_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
267-
DECLARE_CAND_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
268-
DECLARE_CAND_3P_ID_TABLE(_hf_type_, _hf_description_)
251+
#define DECLARE_TABLES_COMMON(_hf_type_, _hf_description_, _hf_namespace_) \
252+
DECLARE_TABLES_COLL(_hf_type_, _hf_description_) \
253+
DECLARE_TABLES_MCCOLL(_hf_type_, _hf_description_, _hf_namespace_) \
254+
DECLARE_TABLE_CAND_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
255+
DECLARE_TABLE_CAND_SEL(_hf_type_, _hf_description_) \
256+
DECLARE_TABLE_MCPARTICLE_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
257+
DECLARE_TABLE_MCPARTICLE_ID(_hf_type_, _hf_description_)
269258

270-
#define DECLARE_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
259+
#define DECLARE_TABLES_2P(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
271260
constexpr uint Marker##_hf_type_ = _marker_number_; \
272-
DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
273-
DECLARE_CAND_2P_TABLES(_hf_type_, _hf_description_, _hf_namespace_)
261+
DECLARE_TABLES_COMMON(_hf_type_, _hf_description_, _hf_namespace_) \
262+
DECLARE_TABLE_CAND_ID_2P(_hf_type_, _hf_description_)
274263

275-
#define DECLARE_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
264+
#define DECLARE_TABLES_3P(_hf_type_, _hf_description_, _hf_namespace_, _marker_number_) \
276265
constexpr uint Marker##_hf_type_ = _marker_number_; \
277-
DECLARE_COLL_TABLES(_hf_type_, _hf_description_, _hf_namespace_) \
278-
DECLARE_CAND_3P_TABLES(_hf_type_, _hf_description_, _hf_namespace_)
266+
DECLARE_TABLES_COMMON(_hf_type_, _hf_description_, _hf_namespace_) \
267+
DECLARE_TABLE_CAND_ID_3P(_hf_type_, _hf_description_)
279268

280269
// ================
281270
// Declarations of common tables for individual species
282271
// ================
283272

284-
DECLARE_2P_TABLES(D0, "D0", d0, 2);
285-
DECLARE_3P_TABLES(Lc, "LC", lc, 3);
286-
DECLARE_3P_TABLES(Dplus, "DP", dplus, 4);
287-
DECLARE_3P_TABLES(Bplus, "BP", bplus, 5);
273+
DECLARE_TABLES_2P(D0, "D0", d0, 2);
274+
DECLARE_TABLES_3P(Lc, "LC", lc, 3);
275+
DECLARE_TABLES_3P(Dplus, "DP", dplus, 4);
276+
DECLARE_TABLES_3P(Bplus, "BP", bplus, 5);
288277

289278
// ================
290279
// Additional species-specific candidate tables

0 commit comments

Comments
 (0)