Skip to content

Commit 7ff6f62

Browse files
BongHwiBong-Hwi Lim
andauthored
[PWGLF] Fix derived index table labels for AO2D merging (#18301)
Co-authored-by: Bong-Hwi Lim <lim@cns.s.u-tokyo.ac.jp>
1 parent 9404f3d commit 7ff6f62

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎PWGLF/DataModel/LFK1MlTables.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ DECLARE_SOA_TABLE(K1MlEvents, "AOD", "K1MLEVENT",
8282
k1ml::K1Centrality, k1ml::K1Multiplicity, k1ml::K1RecINELgt0);
8383
namespace k1ml
8484
{
85-
DECLARE_SOA_INDEX_COLUMN_FULL(K1MlEvent, k1MlEvent, int, K1MlEvents, "");
85+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(K1MlEvent, k1MlEvent, int, K1MlEvents, "K1mlEvents", "");
8686
} // namespace k1ml
8787
DECLARE_SOA_TABLE(K1MlTracks, "AOD", "K1MLTRACK",
8888
o2::soa::Index<>, k1ml::K1MlEventId, k1ml::K1SourceTrackId,
@@ -92,9 +92,9 @@ DECLARE_SOA_TABLE(K1MlTracks, "AOD", "K1MLTRACK",
9292
k1ml::K1CrossedRows, k1ml::K1ItsClusterMap);
9393
namespace k1ml
9494
{
95-
DECLARE_SOA_INDEX_COLUMN_FULL(K1MlKaonTrack, k1MlKaonTrack, int, K1MlTracks, "_Kaon");
96-
DECLARE_SOA_INDEX_COLUMN_FULL(K1MlSamePionTrack, k1MlSamePionTrack, int, K1MlTracks, "_Same");
97-
DECLARE_SOA_INDEX_COLUMN_FULL(K1MlOppPionTrack, k1MlOppPionTrack, int, K1MlTracks, "_Opp");
95+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(K1MlKaonTrack, k1MlKaonTrack, int, K1MlTracks, "K1mlTracks", "_Kaon");
96+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(K1MlSamePionTrack, k1MlSamePionTrack, int, K1MlTracks, "K1mlTracks", "_Same");
97+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(K1MlOppPionTrack, k1MlOppPionTrack, int, K1MlTracks, "K1mlTracks", "_Opp");
9898
} // namespace k1ml
9999
DECLARE_SOA_TABLE(K1MlCandidates, "AOD", "K1MLCANDIDATE",
100100
o2::soa::Index<>, k1ml::K1MlEventId,
@@ -105,7 +105,7 @@ DECLARE_SOA_TABLE(K1MlCandidates, "AOD", "K1MLCANDIDATE",
105105
k1ml::K1BaselinePassBits);
106106
namespace k1ml
107107
{
108-
DECLARE_SOA_INDEX_COLUMN_FULL(K1MlCandidate, k1MlCandidate, int, K1MlCandidates, "");
108+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(K1MlCandidate, k1MlCandidate, int, K1MlCandidates, "K1mlCandidates", "");
109109
} // namespace k1ml
110110
DECLARE_SOA_TABLE(K1MlInputs, "AOD", "K1MLINPUT",
111111
o2::soa::Index<>, k1ml::K1MlCandidateId,

‎PWGLF/DataModel/LFOmega2012MlTables.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ DECLARE_SOA_TABLE(Omega2012MlEvents, "AOD", "OMMLEVENT",
144144
omega2012ml::OmMultiplicity, omega2012ml::OmRecINELgt0);
145145
namespace omega2012ml
146146
{
147-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlEvent, omega2012MlEvent, int, Omega2012MlEvents, "");
147+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlEvent, omega2012MlEvent, int, Omega2012MlEvents, "OmmlEvents", "");
148148
} // namespace omega2012ml
149149

150150
DECLARE_SOA_TABLE(Omega2012MlCascades, "AOD", "OMMLCASCADE",
@@ -186,10 +186,10 @@ DECLARE_SOA_TABLE(Omega2012MlTracks, "AOD", "OMMLTRACK",
186186
omega2012ml::OmCrossedRows, omega2012ml::OmItsClusterMap);
187187
namespace omega2012ml
188188
{
189-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlCascade, omega2012MlCascade, int, Omega2012MlCascades, "");
190-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlV0, omega2012MlV0, int, Omega2012MlV0s, "");
191-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlPionTrack, omega2012MlPionTrack, int, Omega2012MlTracks, "_Pion");
192-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlKaonTrack, omega2012MlKaonTrack, int, Omega2012MlTracks, "_Kaon");
189+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlCascade, omega2012MlCascade, int, Omega2012MlCascades, "OmmlCascades", "");
190+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlV0, omega2012MlV0, int, Omega2012MlV0s, "OmmlV0s", "");
191+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlPionTrack, omega2012MlPionTrack, int, Omega2012MlTracks, "OmmlTracks", "_Pion");
192+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlKaonTrack, omega2012MlKaonTrack, int, Omega2012MlTracks, "OmmlTracks", "_Kaon");
193193
} // namespace omega2012ml
194194

195195
// Mode A: Xi K0S
@@ -200,7 +200,7 @@ DECLARE_SOA_TABLE(Omega2012MlXiK0sCandidates, "AOD", "OMMLXIK0SCAND",
200200
omega2012ml::OmOpeningAngle, omega2012ml::OmCharge, omega2012ml::OmPassBits);
201201
namespace omega2012ml
202202
{
203-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlXiK0sCandidate, omega2012MlXiK0sCandidate, int, Omega2012MlXiK0sCandidates, "");
203+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlXiK0sCandidate, omega2012MlXiK0sCandidate, int, Omega2012MlXiK0sCandidates, "OmmlXiK0sCands", "");
204204
} // namespace omega2012ml
205205
DECLARE_SOA_TABLE(Omega2012MlXiK0sInputs, "AOD", "OMMLXIK0SINPUT",
206206
o2::soa::Index<>, omega2012ml::Omega2012MlXiK0sCandidateId,
@@ -219,7 +219,7 @@ DECLARE_SOA_TABLE(Omega2012MlXi1530KCandidates, "AOD", "OMMLXI1530KCAND",
219219
omega2012ml::OmChargePattern, omega2012ml::OmPassBits);
220220
namespace omega2012ml
221221
{
222-
DECLARE_SOA_INDEX_COLUMN_FULL(Omega2012MlXi1530KCandidate, omega2012MlXi1530KCandidate, int, Omega2012MlXi1530KCandidates, "");
222+
DECLARE_SOA_INDEX_COLUMN_FULL_CUSTOM(Omega2012MlXi1530KCandidate, omega2012MlXi1530KCandidate, int, Omega2012MlXi1530KCandidates, "OmmlXi1530KCands", "");
223223
} // namespace omega2012ml
224224
DECLARE_SOA_TABLE(Omega2012MlXi1530KInputs, "AOD", "OMMLXI1530KINP",
225225
o2::soa::Index<>, omega2012ml::Omega2012MlXi1530KCandidateId,

0 commit comments

Comments
 (0)