@@ -33,7 +33,12 @@ DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int);
3333DECLARE_SOA_COLUMN (RunNumber, runNumber, int );
3434DECLARE_SOA_COLUMN (CentFV0M, centFV0M, float );
3535DECLARE_SOA_COLUMN (CentFT0M, centFT0M, float );
36- DECLARE_SOA_DYNAMIC_COLUMN (Selection_Bit, selection_bit, // ! Dummy
36+ DECLARE_SOA_COLUMN (MultNTracksPVeta1, multNTracksPVeta1, int );
37+ DECLARE_SOA_DYNAMIC_COLUMN (IsInelGt0, isInelGt0, // is INEL > 0
38+ [](int multPveta1) -> bool { return multPveta1 > 0 ; });
39+ DECLARE_SOA_DYNAMIC_COLUMN (IsInelGt1, isInelGt1, // is INEL > 1
40+ [](int multPveta1) -> bool { return multPveta1 > 1 ; });
41+ DECLARE_SOA_DYNAMIC_COLUMN (Selection_bit, selection_bit, // o2-linter: disable=name/o2-column (temporary fix)
3742 [](o2::aod::evsel::EventSelectionFlags /* v*/ ) -> bool { return true ; });
3843} // namespace fullEvent
3944DECLARE_SOA_TABLE (LfNuclEvents, " AOD" , " LFNUCLEvent" ,
@@ -44,66 +49,69 @@ DECLARE_SOA_TABLE(LfNuclEvents, "AOD", "LFNUCLEvent",
4449 collision::PosZ,
4550 fullEvent::CentFV0M,
4651 fullEvent::CentFT0M,
52+ fullEvent::MultNTracksPVeta1,
53+ fullEvent::IsInelGt0<fullEvent::MultNTracksPVeta1>,
54+ fullEvent::IsInelGt1<fullEvent::MultNTracksPVeta1>,
4755 fullEvent::IsEventReject,
4856 fullEvent::RunNumber,
49- fullEvent::Selection_Bit <>);
57+ fullEvent::Selection_bit <>);
5058using LfNuclEvent = LfNuclEvents::iterator;
5159
5260namespace full
5361{
5462DECLARE_SOA_INDEX_COLUMN (LfNuclEvent, lfNuclEvent);
5563DECLARE_SOA_COLUMN (Pt, pt, float );
56- DECLARE_SOA_DYNAMIC_COLUMN (P, p, [](float pt, float eta) -> float { return pt * cosh (eta); });
64+ DECLARE_SOA_DYNAMIC_COLUMN (P, p, [](float pt, float eta) -> float { return pt * std:: cosh (eta); });
5765DECLARE_SOA_COLUMN (Eta, eta, float );
5866DECLARE_SOA_COLUMN (Sign, sign, int16_t );
5967DECLARE_SOA_COLUMN (Phi, phi, float );
6068DECLARE_SOA_COLUMN (IsPVContributor, isPVContributor, bool );
6169DECLARE_SOA_DYNAMIC_COLUMN (Rapidity, rapidity,
6270 [](float pt, float eta, float mass) -> float {
63- const auto p = pt * cosh (eta);
64- const auto pz = pt * sinh (eta);
65- const auto energy = sqrt (p * p + mass * mass);
66- return 0 .5f * log ((energy + pz) / (energy - pz));
71+ const auto p = pt * std:: cosh (eta);
72+ const auto pz = pt * std:: sinh (eta);
73+ const auto energy = std:: sqrt (p * p + mass * mass);
74+ return 0 .5f * std:: log ((energy + pz) / (energy - pz));
6775 });
6876// ITS
69- DECLARE_SOA_COLUMN (ITSClusterSizes , itsClusterSizes, uint32_t ); // ! ITS cluster sizes per layer
77+ DECLARE_SOA_COLUMN (ItsClusterSizes , itsClusterSizes, uint32_t ); // ! ITS cluster sizes per layer
7078// TPC
71- DECLARE_SOA_COLUMN (TPCNSigmaPi , tpcNSigmaPi, float );
72- DECLARE_SOA_COLUMN (TPCNSigmaKa , tpcNSigmaKa, float );
73- DECLARE_SOA_COLUMN (TPCNSigmaPr , tpcNSigmaPr, float );
74- DECLARE_SOA_COLUMN (TPCNSigmaDe , tpcNSigmaDe, float );
75- DECLARE_SOA_COLUMN (TPCNSigmaTr , tpcNSigmaTr, float );
76- DECLARE_SOA_COLUMN (TPCNSigmaHe , tpcNSigmaHe, float );
77- DECLARE_SOA_COLUMN (TPCNSigmaAl , tpcNSigmaAl, float );
79+ DECLARE_SOA_COLUMN (TpcNSigmaPi , tpcNSigmaPi, float );
80+ DECLARE_SOA_COLUMN (TpcNSigmaKa , tpcNSigmaKa, float );
81+ DECLARE_SOA_COLUMN (TpcNSigmaPr , tpcNSigmaPr, float );
82+ DECLARE_SOA_COLUMN (TpcNSigmaDe , tpcNSigmaDe, float );
83+ DECLARE_SOA_COLUMN (TpcNSigmaTr , tpcNSigmaTr, float );
84+ DECLARE_SOA_COLUMN (TpcNSigmaHe , tpcNSigmaHe, float );
85+ DECLARE_SOA_COLUMN (TpcNSigmaAl , tpcNSigmaAl, float );
7886// TOF
79- DECLARE_SOA_COLUMN (TOFNSigmaPi , tofNSigmaPi, float );
80- DECLARE_SOA_COLUMN (TOFNSigmaKa , tofNSigmaKa, float );
81- DECLARE_SOA_COLUMN (TOFNSigmaPr , tofNSigmaPr, float );
82- DECLARE_SOA_COLUMN (TOFNSigmaDe , tofNSigmaDe, float );
83- DECLARE_SOA_COLUMN (TOFNSigmaTr , tofNSigmaTr, float );
84- DECLARE_SOA_COLUMN (TOFNSigmaHe , tofNSigmaHe, float );
85- DECLARE_SOA_COLUMN (TOFNSigmaAl , tofNSigmaAl, float );
86- DECLARE_SOA_COLUMN (TPCExpSignalDiffPr , tpcExpSignalDiffPr, float );
87- DECLARE_SOA_COLUMN (TPCExpSignalDiffDe , tpcExpSignalDiffDe, float );
88- DECLARE_SOA_COLUMN (TPCExpSignalDiffHe , tpcExpSignalDiffHe, float );
89- DECLARE_SOA_COLUMN (TOFExpSignalDiffPr , tofExpSignalDiffPr, float );
90- DECLARE_SOA_COLUMN (TOFExpSignalDiffDe , tofExpSignalDiffDe, float );
91- DECLARE_SOA_COLUMN (TOFExpSignalDiffHe , tofExpSignalDiffHe, float );
87+ DECLARE_SOA_COLUMN (TofNSigmaPi , tofNSigmaPi, float );
88+ DECLARE_SOA_COLUMN (TofNSigmaKa , tofNSigmaKa, float );
89+ DECLARE_SOA_COLUMN (TofNSigmaPr , tofNSigmaPr, float );
90+ DECLARE_SOA_COLUMN (TofNSigmaDe , tofNSigmaDe, float );
91+ DECLARE_SOA_COLUMN (TofNSigmaTr , tofNSigmaTr, float );
92+ DECLARE_SOA_COLUMN (TofNSigmaHe , tofNSigmaHe, float );
93+ DECLARE_SOA_COLUMN (TofNSigmaAl , tofNSigmaAl, float );
94+ DECLARE_SOA_COLUMN (TpcExpSignalDiffPr , tpcExpSignalDiffPr, float );
95+ DECLARE_SOA_COLUMN (TpcExpSignalDiffDe , tpcExpSignalDiffDe, float );
96+ DECLARE_SOA_COLUMN (TpcExpSignalDiffHe , tpcExpSignalDiffHe, float );
97+ DECLARE_SOA_COLUMN (TofExpSignalDiffPr , tofExpSignalDiffPr, float );
98+ DECLARE_SOA_COLUMN (TofExpSignalDiffDe , tofExpSignalDiffDe, float );
99+ DECLARE_SOA_COLUMN (TofExpSignalDiffHe , tofExpSignalDiffHe, float );
92100DECLARE_SOA_COLUMN (IsEvTimeTOF, isEvTimeTOF, bool );
93101DECLARE_SOA_COLUMN (IsEvTimeT0AC, isEvTimeT0AC, bool );
94102DECLARE_SOA_COLUMN (HasTOF, hasTOF, bool );
95103DECLARE_SOA_COLUMN (HasTRD, hasTRD, bool );
96104DECLARE_SOA_COLUMN (DcaXY, dcaXY, float );
97105DECLARE_SOA_COLUMN (DcaZ, dcaZ, float );
98- DECLARE_SOA_COLUMN (TPCInnerParam , tpcInnerParam, float );
99- DECLARE_SOA_COLUMN (TOFExpMom , tofExpMom, float );
100- DECLARE_SOA_COLUMN (TPCSignal , tpcSignal, float );
106+ DECLARE_SOA_COLUMN (TpcInnerParam , tpcInnerParam, float );
107+ DECLARE_SOA_COLUMN (TofExpMom , tofExpMom, float );
108+ DECLARE_SOA_COLUMN (TpcSignal , tpcSignal, float );
101109DECLARE_SOA_COLUMN (Beta, beta, float );
102110// TPC and ITS QA
103- DECLARE_SOA_COLUMN (PIDForTracking , pidForTracking, uint8_t );
104- DECLARE_SOA_COLUMN (ITSNCls , itsNCls, int16_t );
105- DECLARE_SOA_COLUMN (TPCChi2Ncl , tpcChi2NCl, float );
106- DECLARE_SOA_COLUMN (ITSChi2NCl , itsChi2NCl, float );
111+ DECLARE_SOA_COLUMN (PidForTracking , pidForTracking, uint8_t );
112+ DECLARE_SOA_COLUMN (ItsNCls , itsNCls, int16_t );
113+ DECLARE_SOA_COLUMN (TpcChi2NCl , tpcChi2NCl, float );
114+ DECLARE_SOA_COLUMN (ItsChi2NCl , itsChi2NCl, float );
107115DECLARE_SOA_COLUMN (TpcPassed, tpcPassed, bool );
108116DECLARE_SOA_COLUMN (ItsPassed, itsPassed, bool );
109117DECLARE_SOA_COLUMN (FakeHitsFlag, fakeHitsFlag, bool );
@@ -116,79 +124,71 @@ DECLARE_SOA_COLUMN(GetProcess, getProcess, int);
116124} // namespace full
117125namespace dummy
118126{
119- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaPi , tpcNSigmaPi,
127+ DECLARE_SOA_DYNAMIC_COLUMN (TpcNSigmaPi , tpcNSigmaPi,
120128 [](bool /* b*/ ) -> float { return 0 .f ; });
121- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaKa , tpcNSigmaKa,
129+ DECLARE_SOA_DYNAMIC_COLUMN (TpcNSigmaKa , tpcNSigmaKa,
122130 [](bool /* b*/ ) -> float { return 0 .f ; });
123- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaPr , tpcNSigmaPr,
131+ DECLARE_SOA_DYNAMIC_COLUMN (TpcNSigmaPr , tpcNSigmaPr,
124132 [](bool /* b*/ ) -> float { return 0 .f ; });
125- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaTr , tpcNSigmaTr,
133+ DECLARE_SOA_DYNAMIC_COLUMN (TpcNSigmaTr , tpcNSigmaTr,
126134 [](bool /* b*/ ) -> float { return 0 .f ; });
127- DECLARE_SOA_DYNAMIC_COLUMN (TPCNSigmaAl , tpcNSigmaAl,
135+ DECLARE_SOA_DYNAMIC_COLUMN (TpcNSigmaAl , tpcNSigmaAl,
128136 [](bool /* b*/ ) -> float { return 0 .f ; });
129- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaPi , tofNSigmaPi,
137+ DECLARE_SOA_DYNAMIC_COLUMN (TofNSigmaPi , tofNSigmaPi,
130138 [](bool /* b*/ ) -> float { return 0 .f ; });
131- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaKa , tofNSigmaKa,
139+ DECLARE_SOA_DYNAMIC_COLUMN (TofNSigmaKa , tofNSigmaKa,
132140 [](bool /* b*/ ) -> float { return 0 .f ; });
133- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaPr , tofNSigmaPr,
141+ DECLARE_SOA_DYNAMIC_COLUMN (TofNSigmaPr , tofNSigmaPr,
134142 [](bool /* b*/ ) -> float { return 0 .f ; });
135- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaTr , tofNSigmaTr,
143+ DECLARE_SOA_DYNAMIC_COLUMN (TofNSigmaTr , tofNSigmaTr,
136144 [](bool /* b*/ ) -> float { return 0 .f ; });
137- DECLARE_SOA_DYNAMIC_COLUMN (TOFNSigmaAl , tofNSigmaAl,
145+ DECLARE_SOA_DYNAMIC_COLUMN (TofNSigmaAl , tofNSigmaAl,
138146 [](bool /* b*/ ) -> float { return 0 .f ; });
139- DECLARE_SOA_DYNAMIC_COLUMN (TPCExpSignalDiffPr , tpcExpSignalDiffPr,
147+ DECLARE_SOA_DYNAMIC_COLUMN (TpcExpSignalDiffPr , tpcExpSignalDiffPr,
140148 [](bool /* b*/ ) -> float { return 0 .f ; });
141- DECLARE_SOA_DYNAMIC_COLUMN (TPCExpSignalDiffDe , tpcExpSignalDiffDe,
149+ DECLARE_SOA_DYNAMIC_COLUMN (TpcExpSignalDiffDe , tpcExpSignalDiffDe,
142150 [](bool /* b*/ ) -> float { return 0 .f ; });
143- DECLARE_SOA_DYNAMIC_COLUMN (TPCExpSignalDiffHe , tpcExpSignalDiffHe,
151+ DECLARE_SOA_DYNAMIC_COLUMN (TpcExpSignalDiffHe , tpcExpSignalDiffHe,
144152 [](bool /* b*/ ) -> float { return 0 .f ; });
145- DECLARE_SOA_DYNAMIC_COLUMN (TOFExpSignalDiffPr , tofExpSignalDiffPr,
153+ DECLARE_SOA_DYNAMIC_COLUMN (TofExpSignalDiffPr , tofExpSignalDiffPr,
146154 [](bool /* b*/ ) -> float { return 0 .f ; });
147- DECLARE_SOA_DYNAMIC_COLUMN (TOFExpSignalDiffDe , tofExpSignalDiffDe,
155+ DECLARE_SOA_DYNAMIC_COLUMN (TofExpSignalDiffDe , tofExpSignalDiffDe,
148156 [](bool /* b*/ ) -> float { return 0 .f ; });
149- DECLARE_SOA_DYNAMIC_COLUMN (TOFExpSignalDiffHe , tofExpSignalDiffHe,
157+ DECLARE_SOA_DYNAMIC_COLUMN (TofExpSignalDiffHe , tofExpSignalDiffHe,
150158 [](bool /* b*/ ) -> float { return 0 .f ; });
151- DECLARE_SOA_DYNAMIC_COLUMN (TOFExpMom , tofExpMom,
159+ DECLARE_SOA_DYNAMIC_COLUMN (TofExpMom , tofExpMom,
152160 [](bool /* b*/ ) -> float { return 0 .f ; });
153161} // namespace dummy
154162
155- /*
156- namespace fullMC
157- {
158- DECLARE_SOA_INDEX_COLUMN(LfNuclEvent, lfCandNucleusFullEvent);
159- DECLARE_SOA_COLUMN(PdgCode, pdgCode, int);
160- }
161- */
162-
163163DECLARE_SOA_TABLE (LfCandNucleus, " AOD" , " LFNUCL" ,
164164 o2::soa::Index<>,
165165 full::LfNuclEventId,
166166 full::DcaXY, full::DcaZ,
167- full::TPCNSigmaDe , full::TPCNSigmaHe ,
168- full::TOFNSigmaDe , full::TOFNSigmaHe ,
167+ full::TpcNSigmaDe , full::TpcNSigmaHe ,
168+ full::TofNSigmaDe , full::TofNSigmaHe ,
169169 full::IsEvTimeTOF,
170170 full::IsEvTimeT0AC,
171171 full::HasTOF,
172172 full::HasTRD,
173- full::TPCInnerParam ,
173+ full::TpcInnerParam ,
174174 full::Beta,
175- full::PIDForTracking ,
176- full::TPCSignal ,
175+ full::PidForTracking ,
176+ full::TpcSignal ,
177177 full::Pt,
178178 full::Eta,
179179 full::Phi,
180180 full::Sign,
181- full::ITSNCls ,
181+ full::ItsNCls ,
182182 track::TPCNClsFindable,
183183 track::TPCNClsFindableMinusFound,
184184 track::TPCNClsFindableMinusCrossedRows,
185- full::TPCChi2Ncl ,
186- full::ITSChi2NCl ,
185+ full::TpcChi2NCl ,
186+ full::ItsChi2NCl ,
187187 track::ITSClusterMap,
188188 full::IsPVContributor,
189189 full::P<full::Pt, full::Eta>,
190190 full::Rapidity<full::Pt, full::Eta>,
191- full::ITSClusterSizes ,
191+ full::ItsClusterSizes ,
192192 track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
193193 track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
194194 track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
@@ -197,51 +197,51 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1,
197197 o2::soa::Index<>,
198198 full::LfNuclEventId,
199199 full::DcaXY, full::DcaZ,
200- full::TPCNSigmaDe , full::TPCNSigmaHe ,
201- full::TOFNSigmaDe , full::TOFNSigmaHe ,
200+ full::TpcNSigmaDe , full::TpcNSigmaHe ,
201+ full::TofNSigmaDe , full::TofNSigmaHe ,
202202 full::IsEvTimeTOF,
203203 full::IsEvTimeT0AC,
204204 full::HasTOF,
205205 full::HasTRD,
206- full::TPCInnerParam ,
206+ full::TpcInnerParam ,
207207 full::Beta,
208- full::PIDForTracking ,
209- full::TPCSignal ,
208+ full::PidForTracking ,
209+ full::TpcSignal ,
210210 full::Pt,
211211 full::Eta,
212212 full::Phi,
213213 full::Sign,
214- full::ITSNCls ,
214+ full::ItsNCls ,
215215 track::TPCNClsFindable,
216216 track::TPCNClsFindableMinusFound,
217217 track::TPCNClsFindableMinusCrossedRows,
218- full::TPCChi2Ncl ,
219- full::ITSChi2NCl ,
218+ full::TpcChi2NCl ,
219+ full::ItsChi2NCl ,
220220 track::ITSClusterMap,
221221 full::IsPVContributor,
222222 full::P<full::Pt, full::Eta>,
223- full::ITSClusterSizes ,
224- dummy::TPCNSigmaPi <full::HasTOF>, dummy::TPCNSigmaKa <full::HasTOF>, dummy::TPCNSigmaPr <full::HasTOF>,
225- dummy::TPCNSigmaTr <full::HasTOF>, dummy::TPCNSigmaAl <full::HasTOF>,
226- dummy::TOFNSigmaPi <full::HasTOF>, dummy::TOFNSigmaKa <full::HasTOF>, dummy::TOFNSigmaPr <full::HasTOF>,
227- dummy::TOFNSigmaTr <full::HasTOF>, dummy::TOFNSigmaAl <full::HasTOF>,
228- dummy::TPCExpSignalDiffPr <full::HasTOF>, dummy::TPCExpSignalDiffDe <full::HasTOF>, dummy::TPCExpSignalDiffHe <full::HasTOF>,
229- dummy::TOFExpSignalDiffPr <full::HasTOF>, dummy::TOFExpSignalDiffDe <full::HasTOF>, dummy::TOFExpSignalDiffHe <full::HasTOF>,
230- dummy::TOFExpMom <full::HasTOF>,
223+ full::ItsClusterSizes ,
224+ dummy::TpcNSigmaPi <full::HasTOF>, dummy::TpcNSigmaKa <full::HasTOF>, dummy::TpcNSigmaPr <full::HasTOF>,
225+ dummy::TpcNSigmaTr <full::HasTOF>, dummy::TpcNSigmaAl <full::HasTOF>,
226+ dummy::TofNSigmaPi <full::HasTOF>, dummy::TofNSigmaKa <full::HasTOF>, dummy::TofNSigmaPr <full::HasTOF>,
227+ dummy::TofNSigmaTr <full::HasTOF>, dummy::TofNSigmaAl <full::HasTOF>,
228+ dummy::TpcExpSignalDiffPr <full::HasTOF>, dummy::TpcExpSignalDiffDe <full::HasTOF>, dummy::TpcExpSignalDiffHe <full::HasTOF>,
229+ dummy::TofExpSignalDiffPr <full::HasTOF>, dummy::TofExpSignalDiffDe <full::HasTOF>, dummy::TofExpSignalDiffHe <full::HasTOF>,
230+ dummy::TofExpMom <full::HasTOF>,
231231 full::Rapidity<full::Pt, full::Eta>,
232232 track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
233233 track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
234234 track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
235235 track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>);
236236
237237DECLARE_SOA_TABLE (LfCandNucleusExtra, " AOD" , " LFNUCLEXTRA" ,
238- full::TPCNSigmaPi , full::TPCNSigmaKa , full::TPCNSigmaPr ,
239- full::TPCNSigmaTr , full::TPCNSigmaAl ,
240- full::TOFNSigmaPi , full::TOFNSigmaKa , full::TOFNSigmaPr ,
241- full::TOFNSigmaTr , full::TOFNSigmaAl ,
242- full::TPCExpSignalDiffPr , full::TPCExpSignalDiffDe , full::TPCExpSignalDiffHe ,
243- full::TOFExpSignalDiffPr , full::TOFExpSignalDiffDe , full::TOFExpSignalDiffHe ,
244- full::TOFExpMom );
238+ full::TpcNSigmaPi , full::TpcNSigmaKa , full::TpcNSigmaPr ,
239+ full::TpcNSigmaTr , full::TpcNSigmaAl ,
240+ full::TofNSigmaPi , full::TofNSigmaKa , full::TofNSigmaPr ,
241+ full::TofNSigmaTr , full::TofNSigmaAl ,
242+ full::TpcExpSignalDiffPr , full::TpcExpSignalDiffDe , full::TpcExpSignalDiffHe ,
243+ full::TofExpSignalDiffPr , full::TofExpSignalDiffDe , full::TofExpSignalDiffHe ,
244+ full::TofExpMom );
245245
246246DECLARE_SOA_TABLE (LfCandNucleusMC, " AOD" , " LFNUCLMC" ,
247247 mcparticle::PdgCode,
0 commit comments