Skip to content

Commit 0eaac50

Browse files
vkuceravkucera
committed
Fix linter errors
1 parent cf4fe29 commit 0eaac50

File tree

3 files changed

+80
-84
lines changed

3 files changed

+80
-84
lines changed

‎PWGHF/DataModel/DerivedTables.h‎

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

9090
// Declares the base table with MC collisions (McCollBases) and joinable tables (McCollIds, McRCollIds).
91-
#define DECLARE_TABLES_MCCOLL(_hf_type_, _hf_description_, _hf_namespace_) \
92-
namespace hf_mc_coll \
93-
{ \
94-
namespace der_##_hf_namespace_ \
95-
{ \
96-
DECLARE_SOA_ARRAY_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBases, "HF" _hf_description_ "COLLBASES"); \
97-
} \
98-
} \
99-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollBases, "HF" _hf_description_ "MCCOLLBASE", \
100-
o2::soa::Index<>, \
101-
mccollision::PosX, \
102-
mccollision::PosY, \
103-
mccollision::PosZ, \
104-
cent::CentFT0M, \
105-
o2::soa::Marker<Marker##_hf_type_>); \
106-
\
107-
using Hf##_hf_type_##McCollBase = Hf##_hf_type_##McCollBases::iterator; \
108-
using StoredHf##_hf_type_##McCollBase = StoredHf##_hf_type_##McCollBases::iterator; \
109-
\
110-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollIds, "HF" _hf_description_ "MCCOLLID", \
111-
hf_mc_coll::McCollisionId, \
112-
o2::soa::Marker<Marker##_hf_type_>); \
113-
\
114-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID", \
91+
#define DECLARE_TABLES_MCCOLL(_hf_type_, _hf_description_, _hf_namespace_) \
92+
namespace hf_mc_coll \
93+
{ \
94+
namespace der_##_hf_namespace_ \
95+
{ \
96+
DECLARE_SOA_ARRAY_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBases, "HF" _hf_description_ "COLLBASES"); /* o2-linter: disable=name/o2-column (unified getter) */ \
97+
} \
98+
} \
99+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollBases, "HF" _hf_description_ "MCCOLLBASE", \
100+
o2::soa::Index<>, \
101+
mccollision::PosX, \
102+
mccollision::PosY, \
103+
mccollision::PosZ, \
104+
cent::CentFT0M, \
105+
o2::soa::Marker<Marker##_hf_type_>); \
106+
\
107+
using Hf##_hf_type_##McCollBase = Hf##_hf_type_##McCollBases::iterator; \
108+
using StoredHf##_hf_type_##McCollBase = StoredHf##_hf_type_##McCollBases::iterator; \
109+
\
110+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McCollIds, "HF" _hf_description_ "MCCOLLID", \
111+
hf_mc_coll::McCollisionId, \
112+
o2::soa::Marker<Marker##_hf_type_>); \
113+
\
114+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##McRCollIds, "HF" _hf_description_ "MCRCOLLID", \
115115
hf_mc_coll::der_##_hf_namespace_::Hf##_hf_type_##CollBaseIds);
116116

117117
// ================
@@ -165,27 +165,27 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
165165
} // namespace hf_mc_particle
166166

167167
// Declares the base table with candidates (Bases).
168-
#define DECLARE_TABLE_CAND_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
169-
namespace hf_cand_base \
170-
{ \
171-
namespace der_##_hf_namespace_ \
172-
{ \
173-
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBase, "HF" _hf_description_ "COLLBASES"); \
174-
} \
175-
} \
176-
\
177-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Bases, "HF" _hf_description_ "BASE", \
178-
o2::soa::Index<>, \
179-
hf_cand_base::der_##_hf_namespace_::Hf##_hf_type_##CollBaseId, \
180-
hf_cand_base::Pt, \
181-
hf_cand_base::Eta, \
182-
hf_cand_base::Phi, \
183-
hf_cand_base::M, \
184-
hf_cand_base::Y, \
185-
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
186-
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
187-
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
188-
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
168+
#define DECLARE_TABLE_CAND_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
169+
namespace hf_cand_base \
170+
{ \
171+
namespace der_##_hf_namespace_ \
172+
{ \
173+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##CollBase, hfCollBase, "HF" _hf_description_ "COLLBASES"); /* o2-linter: disable=name/o2-column (unified getter) */ \
174+
} \
175+
} \
176+
\
177+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##Bases, "HF" _hf_description_ "BASE", \
178+
o2::soa::Index<>, \
179+
hf_cand_base::der_##_hf_namespace_::Hf##_hf_type_##CollBaseId, \
180+
hf_cand_base::Pt, \
181+
hf_cand_base::Eta, \
182+
hf_cand_base::Phi, \
183+
hf_cand_base::M, \
184+
hf_cand_base::Y, \
185+
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
186+
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
187+
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
188+
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
189189
o2::soa::Marker<Marker##_hf_type_>);
190190

191191
// Declares the table with global indices for 2-prong candidates (Ids).
@@ -237,27 +237,27 @@ DECLARE_SOA_COLUMN(FlagMcDecayChanGen, flagMcDecayChanGen, int8_t); //! resonant
237237
// ================
238238

239239
// Declares the base table with MC particles (PBases).
240-
#define DECLARE_TABLE_MCPARTICLE_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
241-
namespace hf_mc_particle \
242-
{ \
243-
namespace der_##_hf_namespace_ \
244-
{ \
245-
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##McCollBase, hfMcCollBase, "HF" _hf_description_ "MCCOLLBASES"); \
246-
} \
247-
} \
248-
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PBases, "HF" _hf_description_ "PBASE", \
249-
o2::soa::Index<>, \
250-
hf_mc_particle::der_##_hf_namespace_::Hf##_hf_type_##McCollBaseId, \
251-
hf_cand_base::Pt, \
252-
hf_cand_base::Eta, \
253-
hf_cand_base::Phi, \
254-
hf_cand_base::Y, \
255-
hf_mc_particle::FlagMcMatchGen, \
256-
hf_mc_particle::OriginMcGen, \
257-
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
258-
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
259-
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
260-
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
240+
#define DECLARE_TABLE_MCPARTICLE_BASE(_hf_type_, _hf_description_, _hf_namespace_) \
241+
namespace hf_mc_particle \
242+
{ \
243+
namespace der_##_hf_namespace_ \
244+
{ \
245+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(Hf##_hf_type_##McCollBase, hfMcCollBase, "HF" _hf_description_ "MCCOLLBASES"); /* o2-linter: disable=name/o2-column (unified getter) */ \
246+
} \
247+
} \
248+
DECLARE_SOA_TABLE_STAGED(Hf##_hf_type_##PBases, "HF" _hf_description_ "PBASE", \
249+
o2::soa::Index<>, \
250+
hf_mc_particle::der_##_hf_namespace_::Hf##_hf_type_##McCollBaseId, \
251+
hf_cand_base::Pt, \
252+
hf_cand_base::Eta, \
253+
hf_cand_base::Phi, \
254+
hf_cand_base::Y, \
255+
hf_mc_particle::FlagMcMatchGen, \
256+
hf_mc_particle::OriginMcGen, \
257+
hf_cand_base::Px<hf_cand_base::Pt, hf_cand_base::Phi>, \
258+
hf_cand_base::Py<hf_cand_base::Pt, hf_cand_base::Phi>, \
259+
hf_cand_base::Pz<hf_cand_base::Pt, hf_cand_base::Eta>, \
260+
hf_cand_base::P<hf_cand_base::Pt, hf_cand_base::Eta>, \
261261
o2::soa::Marker<Marker##_hf_type_>);
262262

263263
// Declares the table with global indices for MC particles (PIds).

0 commit comments

Comments
 (0)