Skip to content

Commit 92168bc

Browse files
mpucciompuccio
authored
[PWGLF] Refactor + allow non-tracked cascades (#10125)
1 parent c0b0ed1 commit 92168bc

File tree

2 files changed

+405
-406
lines changed

2 files changed

+405
-406
lines changed

‎PWGLF/DataModel/LFNonPromptCascadeTables.h‎

Lines changed: 138 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,14 @@ DECLARE_SOA_COLUMN(V0Radius, v0Radius, float);
7272
DECLARE_SOA_COLUMN(CascLenght, cascLenght, float);
7373
DECLARE_SOA_COLUMN(V0Lenght, v0Lenght, float);
7474

75-
DECLARE_SOA_COLUMN(CascNClusITS, cascNClusITS, int);
76-
DECLARE_SOA_COLUMN(ProtonNClusITS, protonNClusITS, int);
77-
DECLARE_SOA_COLUMN(PionNClusITS, pionNClusITS, int);
78-
DECLARE_SOA_COLUMN(BachKaonNClusITS, bachKaonNClusITS, int);
79-
DECLARE_SOA_COLUMN(BachPionNClusITS, bachPionNClusITS, int);
75+
DECLARE_SOA_COLUMN(CascNClusITS, cascNClusITS, int16_t);
76+
DECLARE_SOA_COLUMN(ProtonNClusITS, protonNClusITS, int16_t);
77+
DECLARE_SOA_COLUMN(PionNClusITS, pionNClusITS, int16_t);
78+
DECLARE_SOA_COLUMN(BachNClusITS, bachNClusITS, int16_t);
8079

81-
DECLARE_SOA_COLUMN(ProtonNClusTPC, protonNClusTPC, int);
82-
DECLARE_SOA_COLUMN(PionNClusTPC, pionNClusTPC, int);
83-
DECLARE_SOA_COLUMN(BachKaonNClusTPC, bachKaonNClusTPC, int);
84-
DECLARE_SOA_COLUMN(BachPionNClusTPC, bachPionNClusTPC, int);
80+
DECLARE_SOA_COLUMN(ProtonNClusTPC, protonNClusTPC, int16_t);
81+
DECLARE_SOA_COLUMN(PionNClusTPC, pionNClusTPC, int16_t);
82+
DECLARE_SOA_COLUMN(BachNClusTPC, bachNClusTPC, int16_t);
8583

8684
DECLARE_SOA_COLUMN(ProtonTPCNSigma, protonTPCNSigma, float);
8785
DECLARE_SOA_COLUMN(PionTPCNSigma, pionTPCNSigma, float);
@@ -90,8 +88,7 @@ DECLARE_SOA_COLUMN(BachPionTPCNSigma, bachPionTPCNSigma, float);
9088

9189
DECLARE_SOA_COLUMN(ProtonHasTOF, protonHasTOF, bool);
9290
DECLARE_SOA_COLUMN(PionHasTOF, pionHasTOF, bool);
93-
DECLARE_SOA_COLUMN(BachKaonHasTOF, bachKaonHasTOF, bool);
94-
DECLARE_SOA_COLUMN(BachPionHasTOF, bachPionHasTOF, bool);
91+
DECLARE_SOA_COLUMN(BachHasTOF, bachHasTOF, bool);
9592

9693
DECLARE_SOA_COLUMN(ProtonTOFNSigma, protonTOFNSigma, float);
9794
DECLARE_SOA_COLUMN(PionTOFNSigma, pionTOFNSigma, float);
@@ -147,20 +144,72 @@ DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
147144
NPCascadeTable::CascNClusITS,
148145
NPCascadeTable::ProtonNClusITS,
149146
NPCascadeTable::PionNClusITS,
150-
NPCascadeTable::BachKaonNClusITS,
151-
NPCascadeTable::BachPionNClusITS,
147+
NPCascadeTable::BachNClusITS,
152148
NPCascadeTable::ProtonNClusTPC,
153149
NPCascadeTable::PionNClusTPC,
154-
NPCascadeTable::BachKaonNClusTPC,
155-
NPCascadeTable::BachPionNClusTPC,
150+
NPCascadeTable::BachNClusTPC,
156151
NPCascadeTable::ProtonTPCNSigma,
157152
NPCascadeTable::PionTPCNSigma,
158153
NPCascadeTable::BachKaonTPCNSigma,
159154
NPCascadeTable::BachPionTPCNSigma,
160155
NPCascadeTable::ProtonHasTOF,
161156
NPCascadeTable::PionHasTOF,
162-
NPCascadeTable::BachKaonHasTOF,
163-
NPCascadeTable::BachPionHasTOF,
157+
NPCascadeTable::BachHasTOF,
158+
NPCascadeTable::ProtonTOFNSigma,
159+
NPCascadeTable::PionTOFNSigma,
160+
NPCascadeTable::BachKaonTOFNSigma,
161+
NPCascadeTable::BachPionTOFNSigma)
162+
163+
DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
164+
NPCascadeTable::MatchingChi2,
165+
NPCascadeTable::DeltaPtITSCascade,
166+
NPCascadeTable::ITSClusSize,
167+
NPCascadeTable::HasReassociatedCluster,
168+
aod::collision::NumContrib,
169+
aod::collision::CollisionTimeRes,
170+
NPCascadeTable::PvX,
171+
NPCascadeTable::PvY,
172+
NPCascadeTable::PvZ,
173+
NPCascadeTable::CascPt,
174+
NPCascadeTable::CascEta,
175+
NPCascadeTable::CascPhi,
176+
NPCascadeTable::ProtonPt,
177+
NPCascadeTable::ProtonEta,
178+
NPCascadeTable::PionPt,
179+
NPCascadeTable::PionEta,
180+
NPCascadeTable::BachPt,
181+
NPCascadeTable::BachEta,
182+
NPCascadeTable::CascDCAxy,
183+
NPCascadeTable::CascDCAz,
184+
NPCascadeTable::ProtonDCAxy,
185+
NPCascadeTable::ProtonDCAz,
186+
NPCascadeTable::PionDCAxy,
187+
NPCascadeTable::PionDCAz,
188+
NPCascadeTable::BachDCAxy,
189+
NPCascadeTable::BachDCAz,
190+
NPCascadeTable::CascCosPA,
191+
NPCascadeTable::V0CosPA,
192+
NPCascadeTable::MassXi,
193+
NPCascadeTable::MassOmega,
194+
NPCascadeTable::MassV0,
195+
NPCascadeTable::CascRadius,
196+
NPCascadeTable::V0Radius,
197+
NPCascadeTable::CascLenght,
198+
NPCascadeTable::V0Lenght,
199+
NPCascadeTable::CascNClusITS,
200+
NPCascadeTable::ProtonNClusITS,
201+
NPCascadeTable::PionNClusITS,
202+
NPCascadeTable::BachNClusITS,
203+
NPCascadeTable::ProtonNClusTPC,
204+
NPCascadeTable::PionNClusTPC,
205+
NPCascadeTable::BachNClusTPC,
206+
NPCascadeTable::ProtonTPCNSigma,
207+
NPCascadeTable::PionTPCNSigma,
208+
NPCascadeTable::BachKaonTPCNSigma,
209+
NPCascadeTable::BachPionTPCNSigma,
210+
NPCascadeTable::ProtonHasTOF,
211+
NPCascadeTable::PionHasTOF,
212+
NPCascadeTable::BachHasTOF,
164213
NPCascadeTable::ProtonTOFNSigma,
165214
NPCascadeTable::PionTOFNSigma,
166215
NPCascadeTable::BachKaonTOFNSigma,
@@ -211,20 +260,86 @@ DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
211260
NPCascadeTable::CascNClusITS,
212261
NPCascadeTable::ProtonNClusITS,
213262
NPCascadeTable::PionNClusITS,
214-
NPCascadeTable::BachKaonNClusITS,
215-
NPCascadeTable::BachPionNClusITS,
263+
NPCascadeTable::BachNClusITS,
264+
NPCascadeTable::ProtonNClusTPC,
265+
NPCascadeTable::PionNClusTPC,
266+
NPCascadeTable::BachNClusTPC,
267+
NPCascadeTable::ProtonTPCNSigma,
268+
NPCascadeTable::PionTPCNSigma,
269+
NPCascadeTable::BachKaonTPCNSigma,
270+
NPCascadeTable::BachPionTPCNSigma,
271+
NPCascadeTable::ProtonHasTOF,
272+
NPCascadeTable::PionHasTOF,
273+
NPCascadeTable::BachHasTOF,
274+
NPCascadeTable::ProtonTOFNSigma,
275+
NPCascadeTable::PionTOFNSigma,
276+
NPCascadeTable::BachKaonTOFNSigma,
277+
NPCascadeTable::BachPionTOFNSigma,
278+
NPCascadeTable::gPt,
279+
NPCascadeTable::gEta,
280+
NPCascadeTable::gPhi,
281+
NPCascadeTable::PDGcode,
282+
NPCascadeTable::DCAxMC,
283+
NPCascadeTable::DCAyMC,
284+
NPCascadeTable::DCAzMC,
285+
NPCascadeTable::MCcollisionMatch)
286+
287+
DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
288+
NPCascadeTable::MatchingChi2,
289+
NPCascadeTable::DeltaPtITSCascade,
290+
NPCascadeTable::ITSClusSize,
291+
NPCascadeTable::HasReassociatedCluster,
292+
NPCascadeTable::IsGoodMatch,
293+
NPCascadeTable::IsGoodCascade,
294+
NPCascadeTable::PdgCodeMom,
295+
NPCascadeTable::PdgCodeITStrack,
296+
NPCascadeTable::IsFromBeauty,
297+
NPCascadeTable::IsFromCharm,
298+
aod::collision::NumContrib,
299+
aod::collision::CollisionTimeRes,
300+
NPCascadeTable::PvX,
301+
NPCascadeTable::PvY,
302+
NPCascadeTable::PvZ,
303+
NPCascadeTable::CascPt,
304+
NPCascadeTable::CascEta,
305+
NPCascadeTable::CascPhi,
306+
NPCascadeTable::ProtonPt,
307+
NPCascadeTable::ProtonEta,
308+
NPCascadeTable::PionPt,
309+
NPCascadeTable::PionEta,
310+
NPCascadeTable::BachPt,
311+
NPCascadeTable::BachEta,
312+
NPCascadeTable::CascDCAxy,
313+
NPCascadeTable::CascDCAz,
314+
NPCascadeTable::ProtonDCAxy,
315+
NPCascadeTable::ProtonDCAz,
316+
NPCascadeTable::PionDCAxy,
317+
NPCascadeTable::PionDCAz,
318+
NPCascadeTable::BachDCAxy,
319+
NPCascadeTable::BachDCAz,
320+
NPCascadeTable::CascCosPA,
321+
NPCascadeTable::V0CosPA,
322+
NPCascadeTable::MassXi,
323+
NPCascadeTable::MassOmega,
324+
NPCascadeTable::MassV0,
325+
NPCascadeTable::CascRadius,
326+
NPCascadeTable::V0Radius,
327+
NPCascadeTable::CascLenght,
328+
NPCascadeTable::V0Lenght,
329+
NPCascadeTable::CascNClusITS,
330+
NPCascadeTable::ProtonNClusITS,
331+
NPCascadeTable::PionNClusITS,
332+
NPCascadeTable::BachNClusITS,
216333
NPCascadeTable::ProtonNClusTPC,
217334
NPCascadeTable::PionNClusTPC,
218-
NPCascadeTable::BachKaonNClusTPC,
219-
NPCascadeTable::BachPionNClusTPC,
335+
NPCascadeTable::BachNClusTPC,
220336
NPCascadeTable::ProtonTPCNSigma,
221337
NPCascadeTable::PionTPCNSigma,
222338
NPCascadeTable::BachKaonTPCNSigma,
223339
NPCascadeTable::BachPionTPCNSigma,
224340
NPCascadeTable::ProtonHasTOF,
225341
NPCascadeTable::PionHasTOF,
226-
NPCascadeTable::BachKaonHasTOF,
227-
NPCascadeTable::BachPionHasTOF,
342+
NPCascadeTable::BachHasTOF,
228343
NPCascadeTable::ProtonTOFNSigma,
229344
NPCascadeTable::PionTOFNSigma,
230345
NPCascadeTable::BachKaonTOFNSigma,

0 commit comments

Comments
 (0)