Skip to content

Commit 22be7c6

Browse files
zhengqi-wQingalibuild
authored
[PWGLF] Add occupancy column in hypertriton tables (#17746)
Co-authored-by: Qing <zhengqingwang@eduroam-174322239-1.dyndns.cern.ch> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 58661b0 commit 22be7c6

3 files changed

Lines changed: 143 additions & 118 deletions

File tree

‎PWGLF/DataModel/LFHypernucleiTables.h‎

Lines changed: 54 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +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
31-
DECLARE_SOA_COLUMN(PsiFT0A, psiFT0A, float); // Psi with FT0A estimator
32-
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); // Multiplicity with FT0A estimator
33-
DECLARE_SOA_COLUMN(PsiFT0C, psiFT0C, float); // Psi with FT0C estimator
34-
DECLARE_SOA_COLUMN(QFT0C, qFT0C, float); // Amplitude with FT0C estimator
35-
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); // Multiplicity with FT0C estimator
36-
DECLARE_SOA_COLUMN(PsiTPC, psiTPC, float); // Psi with TPC estimator
37-
DECLARE_SOA_COLUMN(MultTPC, multTPC, float); // Multiplicity with TPC estimator
38-
DECLARE_SOA_COLUMN(CollisionId, collisionId, int64_t); // CollisionID
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
31+
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
3941

4042
DECLARE_SOA_COLUMN(RunNumber, runNumber, int32_t); // Run number
4143
DECLARE_SOA_COLUMN(IsMatter, isMatter, bool); // bool: true for matter
@@ -62,19 +64,19 @@ DECLARE_SOA_COLUMN(NTPCpidClusHe, nTPCpidClusHe, uint8_t); // Number
6264
DECLARE_SOA_COLUMN(NTPCpidClusPi, nTPCpidClusPi, uint8_t); // Number of TPC clusters with PID information of the Pi daughter
6365
DECLARE_SOA_COLUMN(NTPCCrossedRowsHe, nTPCCrossedRowsHe, uint8_t); // Number of TPC crossed rows of the He daughter
6466
DECLARE_SOA_COLUMN(NTPCCrossedRowsPi, nTPCCrossedRowsPi, uint8_t); // Number of TPC crossed rows of the Pi daughter
65-
DECLARE_SOA_COLUMN(TPCsignalHe, tpcSignalHe, uint16_t); // TPC signal of the He daughter
66-
DECLARE_SOA_COLUMN(TPCsignalPi, tpcSignalPi, uint16_t); // TPC signal of the Pi daughter
67-
DECLARE_SOA_COLUMN(TPCChi2He, tpcChi2He, float); // TPC chi2 of the He daughter
68-
DECLARE_SOA_COLUMN(ITSChi2He, itsChi2He, float); // ITS chi2 of the He daughter
69-
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
7072
DECLARE_SOA_COLUMN(TrackedClSize, trackedClSize, int); // int: zero for non-tracked candidates
7173
DECLARE_SOA_COLUMN(Flags, flags, uint8_t); // Flags for PID in tracking (bits [0, 3] for negative daughter, [4,7] for positive daughter)
72-
DECLARE_SOA_COLUMN(TPCmomHe, tpcMomHe, float); // TPC momentum of the He daughter
73-
DECLARE_SOA_COLUMN(TPCmomPi, tpcMomPi, float); // TPC momentum of the Pi daughter
74-
DECLARE_SOA_COLUMN(TOFMass, tofMass, float); // TOF mass of the candidate
75-
DECLARE_SOA_COLUMN(ITSclusterSizesHe, itsClusterSizesHe, uint32_t); // ITS cluster size of the He daughter
76-
DECLARE_SOA_COLUMN(ITSclusterSizesPi, itsClusterSizesPi, uint32_t); // ITS cluster size of the Pi daughter
77-
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
7880
DECLARE_SOA_COLUMN(DcaHe, dcaHe, float); // DCA between He daughter and V0
7981
DECLARE_SOA_COLUMN(DcaPi, dcaPi, float); // DCA between pi daughter and V0
8082
DECLARE_SOA_COLUMN(GenPt, genPt, float); // Pt of the hypertriton
@@ -95,6 +97,7 @@ DECLARE_SOA_COLUMN(IsTwoBodyDecay, isTwoBodyDecay, bool); // bool: t
9597
DECLARE_SOA_TABLE(DataHypCands, "AOD", "HYPCANDS",
9698
o2::soa::Index<>,
9799
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
100+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
98101
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
99102

100103
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -103,14 +106,15 @@ DECLARE_SOA_TABLE(DataHypCands, "AOD", "HYPCANDS",
103106
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
104107
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
105108
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
106-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
107-
hyperrec::TOFMass,
108-
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,
109112
hyperrec::Flags, hyperrec::TrackedClSize);
110113

111114
DECLARE_SOA_TABLE(DataHypCandsFlow, "AOD", "HYPCANDSFLOW",
112115
o2::soa::Index<>,
113116
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
117+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
114118
hyperrec::PsiFT0A, hyperrec::MultFT0A,
115119
hyperrec::PsiFT0C, hyperrec::MultFT0C, hyperrec::QFT0C,
116120
hyperrec::PsiTPC, hyperrec::MultTPC,
@@ -122,14 +126,15 @@ DECLARE_SOA_TABLE(DataHypCandsFlow, "AOD", "HYPCANDSFLOW",
122126
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
123127
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
124128
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
125-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
126-
hyperrec::TOFMass,
127-
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,
128132
hyperrec::Flags, hyperrec::TrackedClSize);
129133

130134
DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
131135
o2::soa::Index<>,
132136
hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
137+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
133138
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
134139

135140
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -138,9 +143,9 @@ DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
138143
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
139144
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
140145
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
141-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
142-
hyperrec::TOFMass,
143-
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,
144149
hyperrec::Flags, hyperrec::TrackedClSize,
145150
hyperrec::GenPt,
146151
hyperrec::GenPhi,
@@ -159,6 +164,7 @@ DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
159164
DECLARE_SOA_TABLE(DataHypCandsWColl, "AOD", "HYPCANDSWCOLL",
160165
o2::soa::Index<>,
161166
hyperrec::CollisionId, hyperrec::CentralityFT0A, hyperrec::CentralityFT0C, hyperrec::CentralityFT0M,
167+
hyperrec::TrackOccupancyInTimeRange, hyperrec::Ft0cOccupancyInTimeRange,
162168
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
163169

164170
hyperrec::RunNumber, hyperrec::IsMatter,
@@ -167,9 +173,9 @@ DECLARE_SOA_TABLE(DataHypCandsWColl, "AOD", "HYPCANDSWCOLL",
167173
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
168174
hyperrec::DcaV0Daug, hyperrec::DcaHe, hyperrec::DcaPi,
169175
hyperrec::NSigmaHe, hyperrec::NTPCclusHe, hyperrec::NTPCclusPi, hyperrec::NTPCpidClusHe, hyperrec::NTPCpidClusPi, hyperrec::NTPCCrossedRowsHe, hyperrec::NTPCCrossedRowsPi,
170-
hyperrec::TPCmomHe, hyperrec::TPCmomPi, hyperrec::TPCsignalHe, hyperrec::TPCsignalPi, hyperrec::TPCChi2He, hyperrec::ITSChi2He, hyperrec::ITSChi2Pi,
171-
hyperrec::TOFMass,
172-
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,
173179
hyperrec::Flags, hyperrec::TrackedClSize);
174180

175181
using DataHypCand = DataHypCands::iterator;
@@ -187,20 +193,20 @@ DECLARE_SOA_COLUMN(PhiTrit, phiTrit, float); // Phi
187193
DECLARE_SOA_COLUMN(EtaTrit, etaTrit, float); // Eta of the triton kink
188194
DECLARE_SOA_COLUMN(DcaHyperPv, dcaHyperPv, float); // DCA of the hypertriton to the primary vertex
189195
DECLARE_SOA_COLUMN(DcaTritPv, dcaTritPv, float); // DCA of the triton kink to the primary vertex
190-
DECLARE_SOA_COLUMN(DCAKinkTopo, dcaKinkTopo, float); // DCA of the kink topology
191-
DECLARE_SOA_COLUMN(ITSclusterSizesHyper, itsClusterSizesHyper, uint32_t); // ITS cluster size of the hypertriton
192-
DECLARE_SOA_COLUMN(ITSclusterSizesTrit, itsClusterSizesTrit, uint32_t); // ITS cluster size of the triton kink
193-
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
194200

195-
DECLARE_SOA_COLUMN(TPCmomTrit, tpcMomTrit, float); // TPC momentum of the triton kink
196-
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
197203
DECLARE_SOA_COLUMN(NSigmaTPCTrit, nSigmaTPCTrit, float); // Number of tpc sigmas of the triton kink
198204
DECLARE_SOA_COLUMN(NSigmaTOFTrit, nSigmaTOFTrit, float); // Number of tof sigmas of the triton kink
199205

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

205211
} // namespace hyperkink
206212

@@ -210,22 +216,22 @@ DECLARE_SOA_TABLE(DataHypKinkCands, "AOD", "HYPKINKCANDS",
210216
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
211217
hyperrec::IsMatter, hyperkink::PtHyper, hyperkink::PhiHyper, hyperkink::EtaHyper,
212218
hyperkink::PtTrit, hyperkink::PhiTrit, hyperkink::EtaTrit,
213-
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DCAKinkTopo,
214-
hyperkink::ITSclusterSizesHyper, hyperkink::ITSclusterSizesTrit, hyperkink::PIDinTrackTrit,
215-
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);
216222

217223
DECLARE_SOA_TABLE(MCHypKinkCands, "AOD", "MCHYPKINKCANDS",
218224
o2::soa::Index<>,
219225
hyperrec::XPrimVtx, hyperrec::YPrimVtx, hyperrec::ZPrimVtx,
220226
hyperrec::XDecVtx, hyperrec::YDecVtx, hyperrec::ZDecVtx,
221227
hyperrec::IsMatter, hyperkink::PtHyper, hyperkink::PhiHyper, hyperkink::EtaHyper,
222228
hyperkink::PtTrit, hyperkink::PhiTrit, hyperkink::EtaTrit,
223-
hyperkink::DcaHyperPv, hyperkink::DcaTritPv, hyperkink::DCAKinkTopo,
224-
hyperkink::ITSclusterSizesHyper, hyperkink::ITSclusterSizesTrit, hyperkink::PIDinTrackTrit,
225-
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,
226232
hyperrec::GenXDecVtx, hyperrec::GenYDecVtx, hyperrec::GenZDecVtx,
227233
hyperrec::GenPt, hyperkink::GenPtTrit,
228-
hyperrec::IsReco, hyperrec::IsSignal, hyperkink::MCMask, hyperkink::HyperPtITS,
234+
hyperrec::IsReco, hyperrec::IsSignal, hyperkink::McMask, hyperkink::HyperPtITS,
229235
hyperrec::IsRecoMCCollision, hyperrec::IsSurvEvSel);
230236

231237
} // namespace o2::aod

0 commit comments

Comments
 (0)