Skip to content

Commit f5272c6

Browse files
nzardoshnzardosh
authored
PWGJE: Fixing sustructure index coloumn descriptions for merger (#6883)
1 parent 3eb1397 commit f5272c6

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎PWGJE/DataModel/JetSubstructure.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
7272
\
7373
namespace _name_##jetoutput \
7474
{ \
75-
DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##CO, collision, _jet_description_ "CO"); \
76-
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Candidate, candidate, int, _cand_type_, _cand_description_, "_0"); \
75+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##CO, collision, _jet_description_ "COS"); \
76+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Candidate, candidate, int, _cand_type_, _cand_description_ "S", "_0"); \
7777
} \
7878
DECLARE_SOA_TABLE(_jet_type_##Os, "AOD", _jet_description_ "O", _name_##jetoutput::_jet_type_##COId, _name_##jetoutput::CandidateId, jetoutput::JetPt, jetoutput::JetPhi, jetoutput::JetEta, jetoutput::JetY, jetoutput::JetR, jetoutput::JetNConstituents); \
7979
using _jet_type_##O = _jet_type_##Os::iterator; \
8080
namespace _name_##substructure \
8181
{ \
82-
DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##O, outputTable, _jet_description_ "O"); \
82+
DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##O, outputTable, _jet_description_ "OS"); \
8383
DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_, dummy##_jet_type_, []() -> int { return 0; }); \
8484
} \
8585
\
@@ -93,17 +93,17 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
9393
#define JETMATCHING_TABLE_DEF(_jet_type_, _matched_jet_type_, _matched_jet_description_, _name_, _description_) \
9494
namespace _name_##geomatched \
9595
{ \
96-
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetGeo, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_geo"); \
96+
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetGeo, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_geo"); \
9797
} \
9898
\
9999
namespace _name_##ptmatched \
100100
{ \
101-
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetPt, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_pt"); \
101+
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetPt, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_pt"); \
102102
} \
103103
\
104104
namespace _name_##candmatched \
105105
{ \
106-
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetCand, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "O", "_hf"); \
106+
DECLARE_SOA_ARRAY_INDEX_COLUMN_FULL_CUSTOM(_matched_jet_type_, matchedJetCand, int32_t, _matched_jet_type_##Os, _matched_jet_description_ "OS", "_hf"); \
107107
} \
108108
DECLARE_SOA_TABLE(_jet_type_##MOs, "AOD", _description_ "MO", _name_##substructure::_jet_type_##OId, _name_##geomatched::_matched_jet_type_##Ids, _name_##ptmatched::_matched_jet_type_##Ids, _name_##candmatched::_matched_jet_type_##Ids); \
109109
using _jet_type_##MO = _jet_type_##MOs::iterator;

0 commit comments

Comments
 (0)