Skip to content

Commit a7d31d4

Browse files
zhengqi-wzhengqi-w
committed
Fix O2 and MegaLinter issues
1 parent 4938d36 commit a7d31d4

3 files changed

Lines changed: 124 additions & 120 deletions

File tree

‎PWGLF/DataModel/LFHypernucleiTables.h‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ namespace o2::aod
2525
{
2626
namespace hyperrec
2727
{
28-
DECLARE_SOA_COLUMN(CentralityFT0A, centralityFT0A, float); // centrality with FT0A estimator
29-
DECLARE_SOA_COLUMN(CentralityFT0C, centralityFT0C, float); // centrality with FT0C estimator
30-
DECLARE_SOA_COLUMN(CentralityFT0M, centralityFT0M, float); // centrality with FT0M estimator
28+
DECLARE_SOA_COLUMN(CentralityFT0A, centralityFT0A, float); // centrality with FT0A estimator
29+
DECLARE_SOA_COLUMN(CentralityFT0C, centralityFT0C, float); // centrality with FT0C estimator
30+
DECLARE_SOA_COLUMN(CentralityFT0M, centralityFT0M, float); // centrality with FT0M estimator
3131
DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, int); // Track occupancy in the time range around the collision
32-
DECLARE_SOA_COLUMN(FT0COccupancyInTimeRange, ft0cOccupancyInTimeRange, float); // FT0C occupancy in the time range around the collision
33-
DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float); // Psi with FT0A estimator
34-
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); // Multiplicity with FT0A estimator
35-
DECLARE_SOA_COLUMN(PsiFT0C, psiFT0C, float); // Psi with FT0C estimator
36-
DECLARE_SOA_COLUMN(QFT0C, qFT0C, float); // Amplitude with FT0C estimator
37-
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); // Multiplicity with FT0C estimator
38-
DECLARE_SOA_COLUMN(PsiTPC, psiTPC, float); // Psi with TPC estimator
39-
DECLARE_SOA_COLUMN(MultTPC, multTPC, float); // Multiplicity with TPC estimator
40-
DECLARE_SOA_INDEX_COLUMN(Collision, collision); // Collision index
32+
DECLARE_SOA_COLUMN(Ft0cOccupancyInTimeRange, ft0cOccupancyInTimeRange, float); // FT0C occupancy in the time range around the collision
33+
DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float); // Psi with FT0A estimator
34+
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); // Multiplicity with FT0A estimator
35+
DECLARE_SOA_COLUMN(PsiFT0C, psiFT0C, float); // Psi with FT0C estimator
36+
DECLARE_SOA_COLUMN(QFT0C, qFT0C, float); // Amplitude with FT0C estimator
37+
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); // Multiplicity with FT0C estimator
38+
DECLARE_SOA_COLUMN(PsiTPC, psiTPC, float); // Psi with TPC estimator
39+
DECLARE_SOA_COLUMN(MultTPC, multTPC, float); // Multiplicity with TPC estimator
40+
DECLARE_SOA_INDEX_COLUMN(Collision, collision); // Collision index
4141

4242
DECLARE_SOA_COLUMN(RunNumber, runNumber, int32_t); // Run number
4343
DECLARE_SOA_COLUMN(IsMatter, isMatter, bool); // bool: true for matter
@@ -64,19 +64,19 @@ DECLARE_SOA_COLUMN(NTPCpidClusHe, nTPCpidClusHe, uint8_t); // Number
6464
DECLARE_SOA_COLUMN(NTPCpidClusPi, nTPCpidClusPi, uint8_t); // Number of TPC clusters with PID information of the Pi daughter
6565
DECLARE_SOA_COLUMN(NTPCCrossedRowsHe, nTPCCrossedRowsHe, uint8_t); // Number of TPC crossed rows of the He daughter
6666
DECLARE_SOA_COLUMN(NTPCCrossedRowsPi, nTPCCrossedRowsPi, uint8_t); // Number of TPC crossed rows of the Pi daughter
67-
DECLARE_SOA_COLUMN(TPCsignalHe, tpcSignalHe, uint16_t); // TPC signal of the He daughter
68-
DECLARE_SOA_COLUMN(TPCsignalPi, tpcSignalPi, uint16_t); // TPC signal of the Pi daughter
69-
DECLARE_SOA_COLUMN(TPCChi2He, tpcChi2He, float); // TPC chi2 of the He daughter
70-
DECLARE_SOA_COLUMN(ITSChi2He, itsChi2He, float); // ITS chi2 of the He daughter
71-
DECLARE_SOA_COLUMN(ITSChi2Pi, itsChi2Pi, float); // ITS chi2 of the Pi daughter
67+
DECLARE_SOA_COLUMN(TpcSignalHe, tpcSignalHe, uint16_t); // TPC signal of the He daughter
68+
DECLARE_SOA_COLUMN(TpcSignalPi, tpcSignalPi, uint16_t); // TPC signal of the Pi daughter
69+
DECLARE_SOA_COLUMN(TpcChi2He, tpcChi2He, float); // TPC chi2 of the He daughter
70+
DECLARE_SOA_COLUMN(ItsChi2He, itsChi2He, float); // ITS chi2 of the He daughter
71+
DECLARE_SOA_COLUMN(ItsChi2Pi, itsChi2Pi, float); // ITS chi2 of the Pi daughter
7272
DECLARE_SOA_COLUMN(TrackedClSize, trackedClSize, int); // int: zero for non-tracked candidates
7373
DECLARE_SOA_COLUMN(Flags, flags, uint8_t); // Flags for PID in tracking (bits [0, 3] for negative daughter, [4,7] for positive daughter)
74-
DECLARE_SOA_COLUMN(TPCmomHe, tpcMomHe, float); // TPC momentum of the He daughter
75-
DECLARE_SOA_COLUMN(TPCmomPi, tpcMomPi, float); // TPC momentum of the Pi daughter
76-
DECLARE_SOA_COLUMN(TOFMass, tofMass, float); // TOF mass of the candidate
77-
DECLARE_SOA_COLUMN(ITSclusterSizesHe, itsClusterSizesHe, uint32_t); // ITS cluster size of the He daughter
78-
DECLARE_SOA_COLUMN(ITSclusterSizesPi, itsClusterSizesPi, uint32_t); // ITS cluster size of the Pi daughter
79-
DECLARE_SOA_COLUMN(ITSclusterSizesHyp, itsClusterSizesHyp, uint32_t); // ITS cluster size of the Pi daughter
74+
DECLARE_SOA_COLUMN(TpcMomHe, tpcMomHe, float); // TPC momentum of the He daughter
75+
DECLARE_SOA_COLUMN(TpcMomPi, tpcMomPi, float); // TPC momentum of the Pi daughter
76+
DECLARE_SOA_COLUMN(TofMass, tofMass, float); // TOF mass of the candidate
77+
DECLARE_SOA_COLUMN(ItsClusterSizesHe, itsClusterSizesHe, uint32_t); // ITS cluster size of the He daughter
78+
DECLARE_SOA_COLUMN(ItsClusterSizesPi, itsClusterSizesPi, uint32_t); // ITS cluster size of the Pi daughter
79+
DECLARE_SOA_COLUMN(ItsClusterSizesHyp, itsClusterSizesHyp, uint32_t); // ITS cluster size of the Pi daughter
8080
DECLARE_SOA_COLUMN(DcaHe, dcaHe, float); // DCA between He daughter and V0
8181
DECLARE_SOA_COLUMN(DcaPi, dcaPi, float); // DCA between pi daughter and V0
8282
DECLARE_SOA_COLUMN(GenPt, genPt, float); // Pt of the hypertriton
@@ -97,7 +97,7 @@ DECLARE_SOA_COLUMN(IsTwoBodyDecay, isTwoBodyDecay, bool); // bool: t
9797
DECLARE_SOA_TABLE(DataHypCands, "AOD", "HYPCANDS",
9898
o2::soa::Index<>,
9999
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
100-
hyperrec::TrackOccupancyInTimeRange, hyperrec::FT0COccupancyInTimeRange,
100+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
101101
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
102102

103103
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -106,15 +106,15 @@ DECLARE_SOA_TABLE(DataHypCands, "AOD", "HYPCANDS",
106106
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
107107
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
108108
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
109-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
110-
hyperrec::TOFMass,
111-
hyperrec::ITSclusterSizesHe, hyperrec::ITSclusterSizesPi,
109+
hyperrec::TpcMomHe, hyperrec::TpcMomPi, hyperrec::TpcSignalHe, hyperrec::TpcSignalPi, hyperrec::TpcChi2He, hyperrec::ItsChi2He, hyperrec::ItsChi2Pi,
110+
hyperrec::TofMass,
111+
hyperrec::ItsClusterSizesHe, hyperrec::ItsClusterSizesPi,
112112
hyperrec::Flags, hyperrec::TrackedClSize);
113113

114114
DECLARE_SOA_TABLE(DataHypCandsFlow, "AOD", "HYPCANDSFLOW",
115115
o2::soa::Index<>,
116116
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
117-
hyperrec::TrackOccupancyInTimeRange, hyperrec::FT0COccupancyInTimeRange,
117+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
118118
hyperrec::PsiFT0A, hyperrec::MultFT0A,
119119
hyperrec::PsiFT0C, hyperrec::MultFT0C, hyperrec::QFT0C,
120120
hyperrec::PsiTPC, hyperrec::MultTPC,
@@ -126,15 +126,15 @@ DECLARE_SOA_TABLE(DataHypCandsFlow, "AOD", "HYPCANDSFLOW",
126126
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
127127
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
128128
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
129-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
130-
hyperrec::TOFMass,
131-
hyperrec::ITSclusterSizesHe, hyperrec::ITSclusterSizesPi,
129+
hyperrec::TpcMomHe, hyperrec::TpcMomPi, hyperrec::TpcSignalHe, hyperrec::TpcSignalPi, hyperrec::TpcChi2He, hyperrec::ItsChi2He, hyperrec::ItsChi2Pi,
130+
hyperrec::TofMass,
131+
hyperrec::ItsClusterSizesHe, hyperrec::ItsClusterSizesPi,
132132
hyperrec::Flags, hyperrec::TrackedClSize);
133133

134134
DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
135135
o2::soa::Index<>,
136136
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
137-
hyperrec::TrackOccupancyInTimeRange, hyperrec::FT0COccupancyInTimeRange,
137+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
138138
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
139139

140140
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -143,9 +143,9 @@ DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
143143
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
144144
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
145145
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
146-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
147-
hyperrec::TOFMass,
148-
hyperrec::ITSclusterSizesHe, hyperrec::ITSclusterSizesPi,
146+
hyperrec::TpcMomHe, hyperrec::TpcMomPi, hyperrec::TpcSignalHe, hyperrec::TpcSignalPi, hyperrec::TpcChi2He, hyperrec::ItsChi2He, hyperrec::ItsChi2Pi,
147+
hyperrec::TofMass,
148+
hyperrec::ItsClusterSizesHe, hyperrec::ItsClusterSizesPi,
149149
hyperrec::Flags, hyperrec::TrackedClSize,
150150
hyperrec::GenPt,
151151
hyperrec::GenPhi,
@@ -164,7 +164,7 @@ DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
164164
DECLARE_SOA_TABLE(DataHypCandsWColl, "AOD", "HYPCANDSWCOLL",
165165
o2::soa::Index<>,
166166
hyperrec::CollisionId, hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
167-
hyperrec::TrackOccupancyInTimeRange, hyperrec::FT0COccupancyInTimeRange,
167+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
168168
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
169169

170170
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -173,9 +173,9 @@ DECLARE_SOA_TABLE(DataHypCandsWColl, "AOD", "HYPCANDSWCOLL",
173173
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
174174
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
175175
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
176-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
177-
hyperrec::TOFMass,
178-
hyperrec::ITSclusterSizesHe, hyperrec::ITSclusterSizesPi,
176+
hyperrec::TpcMomHe, hyperrec::TpcMomPi, hyperrec::TpcSignalHe, hyperrec::TpcSignalPi, hyperrec::TpcChi2He, hyperrec::ItsChi2He, hyperrec::ItsChi2Pi,
177+
hyperrec::TofMass,
178+
hyperrec::ItsClusterSizesHe, hyperrec::ItsClusterSizesPi,
179179
hyperrec::Flags, hyperrec::TrackedClSize);
180180

181181
using DataHypCand = DataHypCands::iterator;
@@ -193,20 +193,20 @@ DECLARE_SOA_COLUMN(PhiTrit, phiTrit, float); // Phi
193193
DECLARE_SOA_COLUMN(EtaTrit, etaTrit, float); // Eta of the triton kink
194194
DECLARE_SOA_COLUMN(DcaHyperPv, dcaHyperPv, float); // DCA of the hypertriton to the primary vertex
195195
DECLARE_SOA_COLUMN(DcaTritPv, dcaTritPv, float); // DCA of the triton kink to the primary vertex
196-
DECLARE_SOA_COLUMN(DCAKinkTopo, dcaKinkTopo, float); // DCA of the kink topology
197-
DECLARE_SOA_COLUMN(ITSclusterSizesHyper, itsClusterSizesHyper, uint32_t); // ITS cluster size of the hypertriton
198-
DECLARE_SOA_COLUMN(ITSclusterSizesTrit, itsClusterSizesTrit, uint32_t); // ITS cluster size of the triton kink
199-
DECLARE_SOA_COLUMN(PIDinTrackTrit, pidInTrackTrit, uint8_t); // PID in track for the triton kink
196+
DECLARE_SOA_COLUMN(DcaKinkTopo, dcaKinkTopo, float); // DCA of the kink topology
197+
DECLARE_SOA_COLUMN(ItsClusterSizesHyper, itsClusterSizesHyper, uint32_t); // ITS cluster size of the hypertriton
198+
DECLARE_SOA_COLUMN(ItsClusterSizesTrit, itsClusterSizesTrit, uint32_t); // ITS cluster size of the triton kink
199+
DECLARE_SOA_COLUMN(PidInTrackTrit, pidInTrackTrit, uint8_t); // PID in track for the triton kink
200200

201-
DECLARE_SOA_COLUMN(TPCmomTrit, tpcMomTrit, float); // TPC momentum of the triton kink
202-
DECLARE_SOA_COLUMN(TPCsignalTrit, tpcSignalTrit, uint16_t); // TPC signal of the triton kink
201+
DECLARE_SOA_COLUMN(TpcMomTrit, tpcMomTrit, float); // TPC momentum of the triton kink
202+
DECLARE_SOA_COLUMN(TpcSignalTrit, tpcSignalTrit, uint16_t); // TPC signal of the triton kink
203203
DECLARE_SOA_COLUMN(NSigmaTPCTrit, nSigmaTPCTrit, float); // Number of tpc sigmas of the triton kink
204204
DECLARE_SOA_COLUMN(NSigmaTOFTrit, nSigmaTOFTrit, float); // Number of tof sigmas of the triton kink
205205

206206
// MC additional info
207207
DECLARE_SOA_COLUMN(GenPtTrit, genPtTrit, float); // Pt of the triton kink
208208
DECLARE_SOA_COLUMN(HyperPtITS, hyperPtITS, float); // Pt of the hypertriton from ITS standalone, hypertriton tagged with MC truth
209-
DECLARE_SOA_COLUMN(MCMask, mcMask, bool); // bool: true for fake triton
209+
DECLARE_SOA_COLUMN(McMask, mcMask, bool); // bool: true for fake triton
210210

211211
} // namespace hyperkink
212212

@@ -216,22 +216,22 @@ DECLARE_SOA_TABLE(DataHypKinkCands, "AOD", "HYPKINKCANDS",
216216
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
217217
hyperrec::IsMatter, hyperkink::PtHyper, hyperkink::PhiHyper, hyperkink::EtaHyper,
218218
hyperkink::PtTrit, hyperkink::PhiTrit, hyperkink::EtaTrit,
219-
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DCAKinkTopo,
220-
hyperkink::ITSclusterSizesHyper, hyperkink::ITSclusterSizesTrit, hyperkink::PIDinTrackTrit,
221-
hyperkink::TPCmomTrit, hyperkink::TPCsignalTrit, hyperkink::NSigmaTPCTrit, hyperkink::NSigmaTOFTrit);
219+
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DcaKinkTopo,
220+
hyperkink::ItsClusterSizesHyper, hyperkink::ItsClusterSizesTrit, hyperkink::PidInTrackTrit,
221+
hyperkink::TpcMomTrit, hyperkink::TpcSignalTrit, hyperkink::NSigmaTPCTrit, hyperkink::NSigmaTOFTrit);
222222

223223
DECLARE_SOA_TABLE(MCHypKinkCands, "AOD", "MCHYPKINKCANDS",
224224
o2::soa::Index<>,
225225
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
226226
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
227227
hyperrec::IsMatter, hyperkink::PtHyper, hyperkink::PhiHyper, hyperkink::EtaHyper,
228228
hyperkink::PtTrit, hyperkink::PhiTrit, hyperkink::EtaTrit,
229-
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DCAKinkTopo,
230-
hyperkink::ITSclusterSizesHyper, hyperkink::ITSclusterSizesTrit, hyperkink::PIDinTrackTrit,
231-
hyperkink::TPCmomTrit, hyperkink::TPCsignalTrit, hyperkink::NSigmaTPCTrit, hyperkink::NSigmaTOFTrit,
229+
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DcaKinkTopo,
230+
hyperkink::ItsClusterSizesHyper, hyperkink::ItsClusterSizesTrit, hyperkink::PidInTrackTrit,
231+
hyperkink::TpcMomTrit, hyperkink::TpcSignalTrit, hyperkink::NSigmaTPCTrit, hyperkink::NSigmaTOFTrit,
232232
hyperrec::GenXDecVtx, hyperrec::GenYDecVtx, hyperrec::GenZDecVtx,
233233
hyperrec::GenPt, hyperkink::GenPtTrit,
234-
hyperrec::IsReco, hyperrec::IsSignal, hyperkink::MCMask, hyperkink::HyperPtITS,
234+
hyperrec::IsReco, hyperrec::IsSignal, hyperkink::McMask, hyperkink::HyperPtITS,
235235
hyperrec::IsRecoMCCollision, hyperrec::IsSurvEvSel);
236236

237237
} // namespace o2::aod

0 commit comments

Comments
 (0)