Skip to content

Commit da2cbf7

Browse files
authored
Refresh Table name defintions
1 parent 9f82e6c commit da2cbf7

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float); //! sum of am
3434
DECLARE_SOA_COLUMN(GapSide, gapSide, uint8_t); // 0 for side A, 1 for side C, 2 for both sides
3535
} // namespace lrcorrcolltable
3636

37-
DECLARE_SOA_TABLE(CollLRTables, "AOD", "COLLLRTABLE",
37+
DECLARE_SOA_TABLE(LRCollisions, "AOD", "LRCOLLISION",
3838
o2::soa::Index<>,
3939
bc::RunNumber,
4040
lrcorrcolltable::Zvtx,
4141
lrcorrcolltable::Multiplicity,
4242
lrcorrcolltable::Centrality,
4343
timestamp::Timestamp);
44-
using CollLRTable = CollLRTables::iterator;
44+
using LRCollision = LRCollisions::iterator;
4545

46-
DECLARE_SOA_TABLE(UpcCollLRTables, "AOD", "UPCCOLLLRTABLE",
46+
DECLARE_SOA_TABLE(UpcLRCollisions, "AOD", "UPCLRCOLLISION",
4747
o2::soa::Index<>,
4848
bc::GlobalBC,
4949
bc::RunNumber,
@@ -52,30 +52,30 @@ DECLARE_SOA_TABLE(UpcCollLRTables, "AOD", "UPCCOLLLRTABLE",
5252
lrcorrcolltable::TotalFT0AmplitudeA,
5353
lrcorrcolltable::TotalFT0AmplitudeC,
5454
lrcorrcolltable::TotalFV0AmplitudeA);
55-
using UpcCollLRTable = UpcCollLRTables::iterator;
55+
using UpcLRCollision = UpcLRCollisions::iterator;
5656

57-
DECLARE_SOA_TABLE(UpcSgCollLRTables, "AOD", "UPCSGCOLLLRTABLE",
57+
DECLARE_SOA_TABLE(UpcSgLRCollisions, "AOD", "UPCSGLRCOLLISION",
5858
lrcorrcolltable::GapSide);
59-
using UpcSgCollLRTable = UpcSgCollLRTables::iterator;
59+
using UpcSgLRCollision = UpcSgLRCollisions::iterator;
6060

6161
namespace lrcorrzdctable
6262
{
63-
DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
63+
DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
6464
DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float);
6565
DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float);
6666
} // namespace lrcorrzdctable
6767

68-
DECLARE_SOA_TABLE(ZdcLRTables, "AOD", "ZDCLRTABLE",
68+
DECLARE_SOA_TABLE(LRZdcs, "AOD", "LRZDC",
6969
o2::soa::Index<>,
70-
lrcorrzdctable::UpcCollLRTableId,
70+
lrcorrzdctable::UpcLRCollisionId,
7171
lrcorrzdctable::EnergyCommonZNA,
7272
lrcorrzdctable::EnergyCommonZNC);
73-
using ZdcLRTable = ZdcLRTables::iterator;
73+
using LRZdc = LRZdcs::iterator;
7474

7575
namespace lrcorrtrktable
7676
{
77-
DECLARE_SOA_INDEX_COLUMN(CollLRTable, collLRTable);
78-
DECLARE_SOA_INDEX_COLUMN(UpcCollLRTable, upcCollLRTable);
77+
DECLARE_SOA_INDEX_COLUMN(LRCollision, lrCollision);
78+
DECLARE_SOA_INDEX_COLUMN(UpcLRCollision, upcLRCollision);
7979
DECLARE_SOA_COLUMN(Pt, pt, float);
8080
DECLARE_SOA_COLUMN(Eta, eta, float);
8181
DECLARE_SOA_COLUMN(Phi, phi, float);
@@ -99,115 +99,115 @@ enum V0TrackPid {
9999
};
100100
} // namespace lrcorrtrktable
101101

102-
DECLARE_SOA_TABLE(TrkLRTables, "AOD", "TRKLRTABLE",
102+
DECLARE_SOA_TABLE(LRMidTracks, "AOD", "LRMIDTRACK",
103103
o2::soa::Index<>,
104-
lrcorrtrktable::CollLRTableId,
104+
lrcorrtrktable::LRCollisionId,
105105
lrcorrtrktable::Pt,
106106
lrcorrtrktable::Eta,
107107
lrcorrtrktable::Phi,
108108
lrcorrtrktable::TrackType);
109-
using TrkLRTable = TrkLRTables::iterator;
109+
using LRMidTrack = LRMidTracks::iterator;
110110

111-
DECLARE_SOA_TABLE(Ft0aLRTables, "AOD", "FT0ALRTABLE",
111+
DECLARE_SOA_TABLE(LRFt0aTracks, "AOD", "LRFT0ATRACK",
112112
o2::soa::Index<>,
113-
lrcorrtrktable::CollLRTableId,
113+
lrcorrtrktable::LRCollisionId,
114114
lrcorrtrktable::ChannelID,
115115
lrcorrtrktable::Amplitude,
116116
lrcorrtrktable::Eta,
117117
lrcorrtrktable::Phi);
118-
using Ft0aLRTable = Ft0aLRTables::iterator;
118+
using LRFt0aTrack = LRFt0aTracks::iterator;
119119

120-
DECLARE_SOA_TABLE(Ft0cLRTables, "AOD", "FT0CLRTABLE",
120+
DECLARE_SOA_TABLE(LRFt0cTracks, "AOD", "LRFT0CTRACK",
121121
o2::soa::Index<>,
122-
lrcorrtrktable::CollLRTableId,
122+
lrcorrtrktable::LRCollisionId,
123123
lrcorrtrktable::ChannelID,
124124
lrcorrtrktable::Amplitude,
125125
lrcorrtrktable::Eta,
126126
lrcorrtrktable::Phi);
127-
using Ft0cLRTable = Ft0cLRTables::iterator;
127+
using LRFt0cTrack = LRFt0cTracks::iterator;
128128

129-
DECLARE_SOA_TABLE(V0TrkLRTables, "AOD", "V0TRKLRTABLE",
129+
DECLARE_SOA_TABLE(LRV0Tracks, "AOD", "LRV0TRACK",
130130
o2::soa::Index<>,
131-
lrcorrtrktable::CollLRTableId,
131+
lrcorrtrktable::LRCollisionId,
132132
lrcorrtrktable::IdPos,
133133
lrcorrtrktable::IdNeg,
134134
lrcorrtrktable::Pt,
135135
lrcorrtrktable::Eta,
136136
lrcorrtrktable::Phi,
137137
lrcorrtrktable::InvMass,
138138
lrcorrtrktable::V0Type);
139-
using V0TrkLRTable = V0TrkLRTables::iterator;
139+
using LRV0Track = LRV0Tracks::iterator;
140140

141-
DECLARE_SOA_TABLE(MftTrkLRTables, "AOD", "MFTTRKLRTABLE",
141+
DECLARE_SOA_TABLE(LRMftTracks, "AOD", "LRMFTTRACK",
142142
o2::soa::Index<>,
143-
lrcorrtrktable::CollLRTableId,
143+
lrcorrtrktable::LRCollisionId,
144144
lrcorrtrktable::Pt,
145145
lrcorrtrktable::Eta,
146146
lrcorrtrktable::Phi);
147-
using MftTrkLRTable = MftTrkLRTables::iterator;
147+
using LRMftTrack = LRMftTracks::iterator;
148148

149-
DECLARE_SOA_TABLE(MftBestTrkLRTables, "AOD", "MFTBESTTRKLRTABLE",
149+
DECLARE_SOA_TABLE(LRMftBestTracks, "AOD", "LRMFTBESTTRACK",
150150
o2::soa::Index<>,
151-
lrcorrtrktable::CollLRTableId,
151+
lrcorrtrktable::LRCollisionId,
152152
lrcorrtrktable::Pt,
153153
lrcorrtrktable::Eta,
154154
lrcorrtrktable::Phi);
155-
using MftBestTrkLRTable = MftBestTrkLRTables::iterator;
155+
using LRMftBestTrack = LRMftBestTracks::iterator;
156156

157-
DECLARE_SOA_TABLE(TrkLRUpcTables, "AOD", "TRKLRUPCTABLE",
157+
DECLARE_SOA_TABLE(UpcLRMidTracks, "AOD", "UPCLRMIDTRACK",
158158
o2::soa::Index<>,
159-
lrcorrtrktable::UpcCollLRTableId,
159+
lrcorrtrktable::UpcLRCollisionId,
160160
lrcorrtrktable::Pt,
161161
lrcorrtrktable::Eta,
162162
lrcorrtrktable::Phi,
163163
lrcorrtrktable::TrackType);
164-
using TrkLRUpcTable = TrkLRUpcTables::iterator;
164+
using UpcLRMidTrack = UpcLRMidTracks::iterator;
165165

166-
DECLARE_SOA_TABLE(Ft0aLRUpcTables, "AOD", "FT0ALRUpcTABLE",
166+
DECLARE_SOA_TABLE(UpcLRFt0aTracks, "AOD", "UPCLRFT0ATRACK",
167167
o2::soa::Index<>,
168-
lrcorrtrktable::UpcCollLRTableId,
168+
lrcorrtrktable::UpcLRCollisionId,
169169
lrcorrtrktable::ChannelID,
170170
lrcorrtrktable::Amplitude,
171171
lrcorrtrktable::Eta,
172172
lrcorrtrktable::Phi);
173-
using Ft0aLRUpcTable = Ft0aLRUpcTables::iterator;
173+
using UpcLRFt0aTrack = UpcLRFt0aTracks::iterator;
174174

175-
DECLARE_SOA_TABLE(Ft0cLRUpcTables, "AOD", "FT0CLRUpcTABLE",
175+
DECLARE_SOA_TABLE(UpcLRFt0cTracks, "AOD", "UPCLRFT0CTRACK",
176176
o2::soa::Index<>,
177-
lrcorrtrktable::UpcCollLRTableId,
177+
lrcorrtrktable::UpcLRCollisionId,
178178
lrcorrtrktable::ChannelID,
179179
lrcorrtrktable::Amplitude,
180180
lrcorrtrktable::Eta,
181181
lrcorrtrktable::Phi);
182-
using Ft0cLRUpcTable = Ft0cLRUpcTables::iterator;
182+
using UpcLRFt0cTrack = UpcLRFt0cTracks::iterator;
183183

184-
DECLARE_SOA_TABLE(V0TrkLRUpcTables, "AOD", "V0TRKLRUPCTABLE",
184+
DECLARE_SOA_TABLE(UpcLRV0Tracks, "AOD", "UPCLRV0TRACK",
185185
o2::soa::Index<>,
186-
lrcorrtrktable::UpcCollLRTableId,
186+
lrcorrtrktable::UpcLRCollisionId,
187187
lrcorrtrktable::IdPos,
188188
lrcorrtrktable::IdNeg,
189189
lrcorrtrktable::Pt,
190190
lrcorrtrktable::Eta,
191191
lrcorrtrktable::Phi,
192192
lrcorrtrktable::InvMass,
193193
lrcorrtrktable::V0Type);
194-
using V0TrkLRUpcTable = V0TrkLRUpcTables::iterator;
194+
using UpcLRV0Track = UpcLRV0Tracks::iterator;
195195

196-
DECLARE_SOA_TABLE(MftTrkLRUpcTables, "AOD", "MFTTRKLRUPCTABLE",
196+
DECLARE_SOA_TABLE(UpcLRMftTracks, "AOD", "UPCLRMFTTRACK",
197197
o2::soa::Index<>,
198-
lrcorrtrktable::UpcCollLRTableId,
198+
lrcorrtrktable::UpcLRCollisionId,
199199
lrcorrtrktable::Pt,
200200
lrcorrtrktable::Eta,
201201
lrcorrtrktable::Phi);
202-
using MftTrkLRUpcTable = MftTrkLRUpcTables::iterator;
202+
using UpcLRMftTrack = UpcLRMftTracks::iterator;
203203

204-
DECLARE_SOA_TABLE(MftBestTrkLRUpcTables, "AOD", "MFTBESTTRKLRUPCTABLE",
204+
DECLARE_SOA_TABLE(UpcLRMftBestTracks, "AOD", "UPCLRMFTBESTTRACK",
205205
o2::soa::Index<>,
206-
lrcorrtrktable::UpcCollLRTableId,
206+
lrcorrtrktable::UpcLRCollisionId,
207207
lrcorrtrktable::Pt,
208208
lrcorrtrktable::Eta,
209209
lrcorrtrktable::Phi);
210-
using MftBestTrkLRUpcTable = MftBestTrkLRUpcTables::iterator;
210+
using UpcLRMftBestTrack = UpcLRMftBestTracks::iterator;
211211

212212
} // namespace o2::aod
213213

0 commit comments

Comments
 (0)