Skip to content

Commit a0736bd

Browse files
jgrosseoktf
jgrosseo
authored and
ktf
committed
removing all FULL qualifiers by making naming canonical
1 parent 0c2865f commit a0736bd

File tree

2 files changed

+37
-34
lines changed

2 files changed

+37
-34
lines changed

‎Framework/Core/include/Framework/AnalysisDataModel.h‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ using BC = BCs::iterator;
3838
namespace collision
3939
{
4040
DECLARE_SOA_INDEX_COLUMN(BC, bc);
41-
DECLARE_SOA_COLUMN_FULL(PosX, posX, float, "fX");
42-
DECLARE_SOA_COLUMN_FULL(PosY, posY, float, "fY");
43-
DECLARE_SOA_COLUMN_FULL(PosZ, posZ, float, "fZ");
41+
DECLARE_SOA_COLUMN(PosX, posX, float);
42+
DECLARE_SOA_COLUMN(PosY, posY, float);
43+
DECLARE_SOA_COLUMN(PosZ, posZ, float);
4444
DECLARE_SOA_COLUMN(CovXX, covXX, float);
4545
DECLARE_SOA_COLUMN(CovXY, covXY, float);
4646
DECLARE_SOA_COLUMN(CovXZ, covXZ, float);
4747
DECLARE_SOA_COLUMN(CovYY, covYY, float);
4848
DECLARE_SOA_COLUMN(CovYZ, covYZ, float);
4949
DECLARE_SOA_COLUMN(CovZZ, covZZ, float);
5050
DECLARE_SOA_COLUMN(Chi2, chi2, float);
51-
DECLARE_SOA_COLUMN_FULL(NumContrib, numContrib, uint32_t, "fN"); // TODO fix name
51+
DECLARE_SOA_COLUMN(NumContrib, numContrib, uint32_t);
5252
DECLARE_SOA_COLUMN(CollisionTime, collisionTime, float);
5353
DECLARE_SOA_COLUMN(CollisionTimeRes, collisionTimeRes, float);
5454
DECLARE_SOA_COLUMN(CollisionTimeMask, collisionTimeMask, uint8_t); // TODO put nature of CollisionTimeRes here, e.g. MSB 0 = exact range / 1 = Gaussian uncertainty
@@ -68,7 +68,7 @@ namespace track
6868
{
6969
// TRACKPAR TABLE definition
7070
DECLARE_SOA_INDEX_COLUMN(Collision, collision);
71-
DECLARE_SOA_COLUMN(TrackType, trackType, unsigned int); // TODO define enum
71+
DECLARE_SOA_COLUMN(TrackType, trackType, uint8_t); // TODO change to TrackTypeEnum when enums are supported
7272
DECLARE_SOA_COLUMN(X, x, float);
7373
DECLARE_SOA_COLUMN(Alpha, alpha, float);
7474
DECLARE_SOA_COLUMN(Y, y, float);
@@ -123,21 +123,21 @@ DECLARE_SOA_COLUMN(C1PtTgl, c1PtTgl, float);
123123
DECLARE_SOA_COLUMN(C1Pt21Pt2, c1Pt21Pt2, float);
124124

125125
// TRACKEXTRA TABLE definition
126-
DECLARE_SOA_COLUMN_FULL(TPCInnerParam, tpcInnerParam, float, "fTPCinnerP");
126+
DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float);
127127
DECLARE_SOA_COLUMN(Flags, flags, uint64_t);
128-
DECLARE_SOA_COLUMN_FULL(ITSClusterMap, itsClusterMap, uint8_t, "fITSClusterMap");
129-
DECLARE_SOA_COLUMN_FULL(TPCNClsFindable, tpcNClsFindable, uint8_t, "fTPCnclsFindable");
130-
DECLARE_SOA_COLUMN_FULL(TPCNClsFindableMinusFound, tpcNClsFindableMinusFound, int8_t, "fTPCnclsFindableMinusFound");
131-
DECLARE_SOA_COLUMN_FULL(TPCNClsFindableMinusCrossedRows, tpcNClsFindableMinusCrossedRows, int8_t, "fTPCnclsFindableMinusCrossedRows");
132-
DECLARE_SOA_COLUMN_FULL(TPCNClsShared, tpcNClsShared, uint8_t, "fTPCnclsShared");
133-
DECLARE_SOA_COLUMN_FULL(TRDNTracklets, trdNTracklets, uint8_t, "fTRDntracklets");
134-
DECLARE_SOA_COLUMN_FULL(ITSChi2NCl, itsChi2NCl, float, "fITSchi2Ncl");
135-
DECLARE_SOA_COLUMN(TPCchi2Ncl, tpcChi2Ncl, float);
136-
DECLARE_SOA_COLUMN(TRDchi2, trdChi2, float);
137-
DECLARE_SOA_COLUMN(TOFchi2, tofChi2, float);
138-
DECLARE_SOA_COLUMN(TPCsignal, tpcSignal, float);
139-
DECLARE_SOA_COLUMN(TRDsignal, trdSignal, float);
140-
DECLARE_SOA_COLUMN(TOFsignal, tofSignal, float);
128+
DECLARE_SOA_COLUMN(ITSClusterMap, itsClusterMap, uint8_t);
129+
DECLARE_SOA_COLUMN(TPCNClsFindable, tpcNClsFindable, uint8_t);
130+
DECLARE_SOA_COLUMN(TPCNClsFindableMinusFound, tpcNClsFindableMinusFound, int8_t);
131+
DECLARE_SOA_COLUMN(TPCNClsFindableMinusCrossedRows, tpcNClsFindableMinusCrossedRows, int8_t);
132+
DECLARE_SOA_COLUMN(TPCNClsShared, tpcNClsShared, uint8_t);
133+
DECLARE_SOA_COLUMN(TRDNTracklets, trdNTracklets, uint8_t);
134+
DECLARE_SOA_COLUMN(ITSChi2NCl, itsChi2NCl, float);
135+
DECLARE_SOA_COLUMN(TPCChi2Ncl, tpcChi2Ncl, float);
136+
DECLARE_SOA_COLUMN(TRDChi2, trdChi2, float);
137+
DECLARE_SOA_COLUMN(TOFChi2, tofChi2, float);
138+
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float);
139+
DECLARE_SOA_COLUMN(TRDSignal, trdSignal, float);
140+
DECLARE_SOA_COLUMN(TOFSignal, tofSignal, float);
141141
DECLARE_SOA_COLUMN(Length, length, float);
142142
DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsFound, tpcNClsFound, [](uint8_t tpcNClsFindable, uint8_t tpcNClsFindableMinusFound) -> int16_t { return tpcNClsFindable - tpcNClsFindableMinusFound; });
143143
DECLARE_SOA_DYNAMIC_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, [](uint8_t tpcNClsFindable, uint8_t TPCNClsFindableMinusCrossedRows) -> int16_t { return tpcNClsFindable - TPCNClsFindableMinusCrossedRows; });
@@ -191,8 +191,8 @@ DECLARE_SOA_TABLE(TracksExtra, "AOD", "TRACKEXTRA",
191191
track::TPCInnerParam, track::Flags, track::ITSClusterMap,
192192
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows,
193193
track::TPCNClsShared, track::TRDNTracklets, track::ITSChi2NCl,
194-
track::TPCchi2Ncl, track::TRDchi2, track::TOFchi2,
195-
track::TPCsignal, track::TRDsignal, track::TOFsignal, track::Length,
194+
track::TPCChi2Ncl, track::TRDChi2, track::TOFChi2,
195+
track::TPCSignal, track::TRDSignal, track::TOFSignal, track::Length,
196196
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
197197
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
198198
track::ITSNCls<track::ITSClusterMap>,
@@ -221,27 +221,31 @@ DECLARE_SOA_COLUMN(CellNumber, cellNumber, int16_t);
221221
DECLARE_SOA_COLUMN(Amplitude, amplitude, float);
222222
DECLARE_SOA_COLUMN(Time, time, float);
223223
DECLARE_SOA_COLUMN(CellType, cellType, int8_t);
224-
DECLARE_SOA_COLUMN_FULL(CaloType, caloType, int8_t, "fType"); // FIXME fix naming
224+
DECLARE_SOA_COLUMN(CaloType, caloType, int8_t);
225225
} // namespace calo
226226

227227
DECLARE_SOA_TABLE(Calos, "AOD", "CALO", calo::BCId,
228-
calo::CellNumber, calo::Amplitude, calo::Time, calo::CellType, calo::CaloType);
228+
calo::CellNumber, calo::Amplitude, calo::Time,
229+
calo::CellType, calo::CaloType);
229230
using Calo = Calos::iterator;
230231

231232
namespace calotrigger
232233
{
233234
DECLARE_SOA_INDEX_COLUMN(BC, bc);
234-
DECLARE_SOA_COLUMN_FULL(FastorAbsId, fastorAbsId, int32_t, "fFastorAbsID");
235+
DECLARE_SOA_COLUMN(FastOrAbsId, fastOrAbsId, int32_t);
235236
DECLARE_SOA_COLUMN(L0Amplitude, l0Amplitude, float);
236237
DECLARE_SOA_COLUMN(L0Time, l0Time, float);
237-
DECLARE_SOA_COLUMN_FULL(L1Timesum, l1Timesum, int32_t, "fL1TimeSum");
238+
DECLARE_SOA_COLUMN(L1TimeSum, l1TimeSum, int32_t);
238239
DECLARE_SOA_COLUMN(NL0Times, nl0Times, int8_t);
239-
DECLARE_SOA_COLUMN_FULL(BCbits, triggerbits, int32_t, "fBCBits");
240-
DECLARE_SOA_COLUMN_FULL(CaloType, caloType, int8_t, "fType"); // FIXME fix naming
240+
DECLARE_SOA_COLUMN(TriggerBits, triggerBits, int32_t);
241+
DECLARE_SOA_COLUMN(CaloType, caloType, int8_t);
241242
} // namespace calotrigger
242243

243244
DECLARE_SOA_TABLE(CaloTriggers, "AOD", "CALOTRIGGER",
244-
calotrigger::BCId, calotrigger::FastorAbsId, calotrigger::L0Amplitude, calotrigger::L0Time, calotrigger::L1Timesum, calotrigger::NL0Times, calotrigger::BCbits, calotrigger::CaloType);
245+
calotrigger::BCId, calotrigger::FastOrAbsId,
246+
calotrigger::L0Amplitude, calotrigger::L0Time,
247+
calotrigger::L1TimeSum, calotrigger::NL0Times,
248+
calotrigger::TriggerBits, calotrigger::CaloType);
245249
using CaloTrigger = CaloTriggers::iterator;
246250

247251
namespace muon
@@ -250,28 +254,27 @@ DECLARE_SOA_INDEX_COLUMN(BC, bc);
250254
DECLARE_SOA_COLUMN(InverseBendingMomentum, inverseBendingMomentum, float);
251255
DECLARE_SOA_COLUMN(ThetaX, thetaX, float);
252256
DECLARE_SOA_COLUMN(ThetaY, thetaY, float);
253-
DECLARE_SOA_COLUMN_FULL(ZMu, zMu, float, "fZ");
257+
DECLARE_SOA_COLUMN(ZMu, zMu, float);
254258
DECLARE_SOA_COLUMN(BendingCoor, bendingCoor, float);
255259
DECLARE_SOA_COLUMN(NonBendingCoor, nonBendingCoor, float);
256260
// FIXME: need to implement array columns...
257261
// DECLARE_SOA_COLUMN(Covariances, covariances, float[], "fCovariances");
258262
DECLARE_SOA_COLUMN(Chi2, chi2, float);
259-
DECLARE_SOA_COLUMN(Chi2MatchBC, chi2MatchBC, float);
263+
DECLARE_SOA_COLUMN(Chi2MatchTrigger, chi2MatchTrigger, float);
260264
} // namespace muon
261265

262266
DECLARE_SOA_TABLE(Muons, "AOD", "MUON",
263267
muon::BCId, muon::InverseBendingMomentum,
264268
muon::ThetaX, muon::ThetaY, muon::ZMu,
265269
muon::BendingCoor, muon::NonBendingCoor,
266-
muon::Chi2, muon::Chi2MatchBC);
270+
muon::Chi2, muon::Chi2MatchTrigger);
267271
using Muon = Muons::iterator;
268272

269273
// NOTE for now muon tracks are uniquely assigned to a BC / GlobalBC assuming they contain an MID hit. Discussion on tracks without MID hit is ongoing.
270274

271275
namespace muoncluster
272276
{
273-
/// FIXME: where does this point to???? Tracks or Muons?
274-
DECLARE_SOA_INDEX_COLUMN_FULL(Track, track, int, Muons, "fMuonsID");
277+
DECLARE_SOA_INDEX_COLUMN_FULL(Track, track, int, Muons, "fMuonsID"); // points to a muon track in the Muon table
275278
DECLARE_SOA_COLUMN(X, x, float);
276279
DECLARE_SOA_COLUMN(Y, y, float);
277280
DECLARE_SOA_COLUMN(Z, z, float);

‎Framework/Core/include/Framework/DataTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace o2::aod::track
1414
{
15-
enum TrackTypeEnum : unsigned int {
15+
enum TrackTypeEnum : uint8_t {
1616
GlobalTrack,
1717
ITSStandalone,
1818
MFTStandalone,

0 commit comments

Comments
 (0)