Skip to content

Commit ca65bf7

Browse files
committed
Fix formatting
1 parent b62fe72 commit ca65bf7

2 files changed

Lines changed: 14 additions & 143 deletions

File tree

PWGJE/DataModel/Jet.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,33 +137,33 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
137137
constituentssub::P<constituentssub::Pt, constituentssub::Eta>);
138138

139139
// combine definition of tables for jets, constituents, and substructure
140-
#define DECLARE_JET_TABLES(_collision_name_, _jet_type_, _const_type_, _hfcand_type_, _description_) \
141-
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, _description_); \
142-
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
140+
#define DECLARE_JET_TABLES(_collision_name_, _jet_type_, _const_type_, _hfcand_type_, _description_) \
141+
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, _description_); \
142+
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
143143
JET_CONSTITUENTS_ARRAY_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, _description_, _const_type_, _hfcand_type_); \
144-
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
144+
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
145145
JET_CONSTITUENTS_SUB_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, _description_); \
146146
using _jet_type_##Jet##ConstituentSub = _jet_type_##Jet##ConstituentsSub::iterator;
147147

148148
#define DECLARE_JETMATCHING_TABLE(_jet_type_base_, _jet_type_tag_, _description_) \
149149
DECLARE_SOA_TABLE(_jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jets, "AOD", _description_, \
150150
_jet_type_tag_##jetmatchingGeo::_jet_type_tag_##JetId, \
151-
_jet_type_tag_##jetmatchingCand::_jet_type_tag_##JetId); \
151+
_jet_type_tag_##jetmatchingCand::_jet_type_tag_##JetId); \
152152
using _jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jet = _jet_type_base_##JetsMatchedTo##_jet_type_tag_##Jets::iterator;
153153

154154
// generate tables for data-, detector- and particle-level jets
155-
#define DECLARE_JET_TABLES_LEVELS(_jet_type_, _hfcand_type_, _shortname_) \
156-
DECLARE_JET_TABLES(Collision, _jet_type_, Track, _hfcand_type_, _shortname_ "JET"); \
157-
DECLARE_JET_TABLES(Collision, _jet_type_##MCDetectorLevel, Track, _hfcand_type_, _shortname_ "DJET"); \
158-
DECLARE_JET_TABLES(McCollision, _jet_type_##MCParticleLevel, McParticle, McParticles, _shortname_ "PJET"); \
155+
#define DECLARE_JET_TABLES_LEVELS(_jet_type_, _hfcand_type_, _shortname_) \
156+
DECLARE_JET_TABLES(Collision, _jet_type_, Track, _hfcand_type_, _shortname_ "JET"); \
157+
DECLARE_JET_TABLES(Collision, _jet_type_##MCDetectorLevel, Track, _hfcand_type_, _shortname_ "DJET"); \
158+
DECLARE_JET_TABLES(McCollision, _jet_type_##MCParticleLevel, McParticle, McParticles, _shortname_ "PJET"); \
159159
DECLARE_JETMATCHING_TABLE(_jet_type_##MCParticleLevel, _jet_type_##MCDetectorLevel, _shortname_ "JETMP2D") \
160160
DECLARE_JETMATCHING_TABLE(_jet_type_##MCDetectorLevel, _jet_type_##MCParticleLevel, _shortname_ "JETMD2P")
161161

162-
#define DECLARE_JET_TABLES_LEVELS2(_jet_type_, _hfcand_type_, _shortname_) \
163-
DECLARE_JET_TABLES(Collision, _jet_type_, Track, _hfcand_type_, _shortname_ "JET"); \
164-
DECLARE_JET_TABLES(Collision, _jet_type_##MCD, Track, _hfcand_type_, _shortname_ "DJET"); \
165-
DECLARE_JET_TABLES(McCollision, _jet_type_##MCP, McParticle, McParticles, _shortname_ "PJET"); \
166-
DECLARE_JETMATCHING_TABLE(_jet_type_##MCP, _jet_type_##MCD, _shortname_ "JETMP2D") \
162+
#define DECLARE_JET_TABLES_LEVELS2(_jet_type_, _hfcand_type_, _shortname_) \
163+
DECLARE_JET_TABLES(Collision, _jet_type_, Track, _hfcand_type_, _shortname_ "JET"); \
164+
DECLARE_JET_TABLES(Collision, _jet_type_##MCD, Track, _hfcand_type_, _shortname_ "DJET"); \
165+
DECLARE_JET_TABLES(McCollision, _jet_type_##MCP, McParticle, McParticles, _shortname_ "PJET"); \
166+
DECLARE_JETMATCHING_TABLE(_jet_type_##MCP, _jet_type_##MCD, _shortname_ "JETMP2D") \
167167
DECLARE_JETMATCHING_TABLE(_jet_type_##MCD, _jet_type_##MCP, _shortname_ "JETMD2P")
168168

169169
namespace o2::aod

PWGJE/DataModel/JetHF.h

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)