Skip to content

Commit dd70059

Browse files
pstahlhupstahlhu
committed
Restructure lite/full KF output tables
1 parent fe3c764 commit dd70059

File tree

1 file changed

+81
-56
lines changed

1 file changed

+81
-56
lines changed

‎PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx‎

Lines changed: 81 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ namespace o2::aod
4343
{
4444
namespace full
4545
{
46+
DECLARE_SOA_COLUMN(ParticleFlag, particleFlag, int); //! hf_cand_xic_to_xi_pi_pi::Sign for data, hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec for MC
4647
DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int); //! Selection flag of candidate (output of candidateSelector)
4748
// vertices
4849
DECLARE_SOA_COLUMN(Chi2SV, chi2SV, float); //! Chi2 of candidate vertex
@@ -79,10 +80,9 @@ DECLARE_SOA_COLUMN(MaxNormalisedDeltaIP, maxNormalisedDeltaIP, float);
7980
} // namespace full
8081

8182
DECLARE_SOA_TABLE(HfCandXicToXiPiPiLites, "AOD", "HFXICXI2PILITE",
82-
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
83+
full::ParticleFlag,
8384
hf_cand_xic_to_xi_pi_pi::OriginRec,
8485
full::CandidateSelFlag,
85-
hf_cand_xic_to_xi_pi_pi::Sign,
8686
full::Y,
8787
full::Eta,
8888
full::Phi,
@@ -117,23 +117,17 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiLites, "AOD", "HFXICXI2PILITE",
117117
full::MaxNormalisedDeltaIP);
118118

119119
DECLARE_SOA_TABLE(HfCandXicToXiPiPiLiteKfs, "AOD", "HFXICXI2PILITKF",
120-
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
120+
full::ParticleFlag,
121121
hf_cand_xic_to_xi_pi_pi::OriginRec,
122122
full::CandidateSelFlag,
123-
hf_cand_xic_to_xi_pi_pi::Sign,
124123
full::Y,
125124
full::Eta,
126125
full::Phi,
127-
full::P,
128126
full::Pt,
129127
full::PtXi,
130128
full::PtPi0,
131129
full::PtPi1,
132130
full::M,
133-
hf_cand_xic_to_xi_pi_pi::InvMassXi,
134-
hf_cand_xic_to_xi_pi_pi::InvMassLambda,
135-
hf_cand_xic_to_xi_pi_pi::InvMassXiPi0,
136-
hf_cand_xic_to_xi_pi_pi::InvMassXiPi1,
137131
full::Chi2SV,
138132
full::Ct,
139133
full::DecayLength,
@@ -146,13 +140,33 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiLiteKfs, "AOD", "HFXICXI2PILITKF",
146140
hf_cand_xic_to_xi_pi_pi::CpaXYXi,
147141
hf_cand_xic_to_xi_pi_pi::CpaLambda,
148142
hf_cand_xic_to_xi_pi_pi::CpaXYLambda,
143+
hf_cand_xic_to_xi_pi_pi::CpaLambdaToXi,
144+
hf_cand_xic_to_xi_pi_pi::CpaXYLambdaToXi,
149145
full::ImpactParameterXi,
150146
full::ImpactParameterNormalisedXi,
151147
full::ImpactParameterPi0,
152148
full::ImpactParameterNormalisedPi0,
153149
full::ImpactParameterPi1,
154150
full::ImpactParameterNormalisedPi1,
155151
full::MaxNormalisedDeltaIP,
152+
hf_cand_xic_to_xi_pi_pi::DcaXiDaughters,
153+
hf_cand_xic_to_xi_pi_pi::DcaV0Daughters,
154+
hf_cand_xic_to_xi_pi_pi::DcaXYCascToPV,
155+
hf_cand_xic_to_xi_pi_pi::DcaZCascToPV,
156+
hf_cand_xic_to_xi_pi_pi::DcaBachelorToPV,
157+
hf_cand_xic_to_xi_pi_pi::DcaPosToPV,
158+
hf_cand_xic_to_xi_pi_pi::DcaNegToPV,
159+
// PID information
160+
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus0,
161+
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus1,
162+
hf_cand_xic_to_xi_pi_pi::NSigTpcBachelorPi,
163+
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromLambda,
164+
hf_cand_xic_to_xi_pi_pi::NSigTpcPrFromLambda,
165+
hf_cand_xic_to_xi_pi_pi::NSigTofPiFromXicPlus0,
166+
hf_cand_xic_to_xi_pi_pi::NSigTofPiFromXicPlus1,
167+
hf_cand_xic_to_xi_pi_pi::NSigTofBachelorPi,
168+
hf_cand_xic_to_xi_pi_pi::NSigTofPiFromLambda,
169+
hf_cand_xic_to_xi_pi_pi::NSigTofPrFromLambda,
156170
// KF specific columns
157171
full::Chi2GeoXi,
158172
full::Chi2GeoLambda,
@@ -172,10 +186,9 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiLiteKfs, "AOD", "HFXICXI2PILITKF",
172186
hf_cand_xic_to_xi_pi_pi::DcaXYPi1Xi);
173187

174188
DECLARE_SOA_TABLE(HfCandXicToXiPiPiFulls, "AOD", "HFXICXI2PIFULL",
175-
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
189+
full::ParticleFlag,
176190
hf_cand_xic_to_xi_pi_pi::OriginRec,
177191
full::CandidateSelFlag,
178-
hf_cand_xic_to_xi_pi_pi::Sign,
179192
full::Y,
180193
full::Eta,
181194
full::Phi,
@@ -235,23 +248,17 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFulls, "AOD", "HFXICXI2PIFULL",
235248
hf_cand_xic_to_xi_pi_pi::NSigTofPrFromLambda);
236249

237250
DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullKfs, "AOD", "HFXICXI2PIFULKF",
238-
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
251+
full::ParticleFlag,
239252
hf_cand_xic_to_xi_pi_pi::OriginRec,
240253
full::CandidateSelFlag,
241-
hf_cand_xic_to_xi_pi_pi::Sign,
242254
full::Y,
243255
full::Eta,
244256
full::Phi,
245-
full::P,
246257
full::Pt,
247258
full::PtXi,
248259
full::PtPi0,
249260
full::PtPi1,
250261
full::M,
251-
hf_cand_xic_to_xi_pi_pi::InvMassXi,
252-
hf_cand_xic_to_xi_pi_pi::InvMassLambda,
253-
hf_cand_xic_to_xi_pi_pi::InvMassXiPi0,
254-
hf_cand_xic_to_xi_pi_pi::InvMassXiPi1,
255262
full::Chi2SV,
256263
full::Ct,
257264
full::DecayLength,
@@ -264,28 +271,34 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullKfs, "AOD", "HFXICXI2PIFULKF",
264271
hf_cand_xic_to_xi_pi_pi::CpaXYXi,
265272
hf_cand_xic_to_xi_pi_pi::CpaLambda,
266273
hf_cand_xic_to_xi_pi_pi::CpaXYLambda,
274+
hf_cand_xic_to_xi_pi_pi::CpaLambdaToXi,
275+
hf_cand_xic_to_xi_pi_pi::CpaXYLambdaToXi,
267276
full::ImpactParameterXi,
268277
full::ImpactParameterNormalisedXi,
269278
full::ImpactParameterPi0,
270279
full::ImpactParameterNormalisedPi0,
271280
full::ImpactParameterPi1,
272281
full::ImpactParameterNormalisedPi1,
273282
full::MaxNormalisedDeltaIP,
283+
hf_cand_xic_to_xi_pi_pi::DcaXiDaughters,
284+
hf_cand_xic_to_xi_pi_pi::DcaV0Daughters,
285+
hf_cand_xic_to_xi_pi_pi::DcaXYCascToPV,
286+
hf_cand_xic_to_xi_pi_pi::DcaZCascToPV,
287+
hf_cand_xic_to_xi_pi_pi::DcaBachelorToPV,
288+
hf_cand_xic_to_xi_pi_pi::DcaPosToPV,
289+
hf_cand_xic_to_xi_pi_pi::DcaNegToPV,
274290
// additional columns only stored in the full candidate table
275-
hf_cand_xic_to_xi_pi_pi::CpaLambdaToXi,
276-
hf_cand_xic_to_xi_pi_pi::CpaXYLambdaToXi,
291+
hf_cand_xic_to_xi_pi_pi::InvMassXi,
292+
hf_cand_xic_to_xi_pi_pi::InvMassXiPi0,
293+
hf_cand_xic_to_xi_pi_pi::InvMassXiPi1,
294+
hf_cand_xic_to_xi_pi_pi::InvMassLambda,
295+
full::P,
277296
full::PPi0,
278297
full::PPi1,
279298
hf_cand_xic_to_xi_pi_pi::PBachelorPi,
280299
hf_cand_xic_to_xi_pi_pi::PPiFromLambda,
281300
hf_cand_xic_to_xi_pi_pi::PPrFromLambda,
282-
hf_cand_xic_to_xi_pi_pi::DcaXiDaughters,
283-
hf_cand_xic_to_xi_pi_pi::DcaV0Daughters,
284-
hf_cand_xic_to_xi_pi_pi::DcaPosToPV,
285-
hf_cand_xic_to_xi_pi_pi::DcaNegToPV,
286-
hf_cand_xic_to_xi_pi_pi::DcaBachelorToPV,
287-
hf_cand_xic_to_xi_pi_pi::DcaXYCascToPV,
288-
hf_cand_xic_to_xi_pi_pi::DcaZCascToPV,
301+
// PID information
289302
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus0,
290303
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus1,
291304
hf_cand_xic_to_xi_pi_pi::NSigTpcBachelorPi,
@@ -362,19 +375,18 @@ struct HfTreeCreatorXicToXiPiPi {
362375
template <bool doMc, bool doKf, typename T>
363376
void fillCandidateTable(const T& candidate)
364377
{
365-
int8_t flagMc = 0;
378+
int8_t particleFlag = candidate.sign();
366379
int8_t originMc = 0;
367380
if constexpr (doMc) {
368-
flagMc = candidate.flagMcMatchRec();
381+
particleFlag = candidate.flagMcMatchRec();
369382
originMc = candidate.originRec();
370383
}
371384
if constexpr (!doKf) {
372385
if (fillCandidateLiteTable) {
373386
rowCandidateLite(
374-
flagMc,
387+
particleFlag,
375388
originMc,
376389
candidate.isSelXicToXiPiPi(),
377-
candidate.sign(),
378390
candidate.y(o2::constants::physics::MassXiCPlus),
379391
candidate.eta(),
380392
candidate.phi(),
@@ -409,10 +421,9 @@ struct HfTreeCreatorXicToXiPiPi {
409421
candidate.maxNormalisedDeltaIP());
410422
} else {
411423
rowCandidateFull(
412-
flagMc,
424+
particleFlag,
413425
originMc,
414426
candidate.isSelXicToXiPiPi(),
415-
candidate.sign(),
416427
candidate.y(o2::constants::physics::MassXiCPlus),
417428
candidate.eta(),
418429
candidate.phi(),
@@ -474,23 +485,17 @@ struct HfTreeCreatorXicToXiPiPi {
474485
} else {
475486
if (fillCandidateLiteTable) {
476487
rowCandidateLiteKf(
477-
flagMc,
488+
particleFlag,
478489
originMc,
479490
candidate.isSelXicToXiPiPi(),
480-
candidate.sign(),
481491
candidate.y(o2::constants::physics::MassXiCPlus),
482492
candidate.eta(),
483493
candidate.phi(),
484-
candidate.p(),
485494
candidate.pt(),
486495
candidate.ptProng0(),
487496
candidate.ptProng1(),
488497
candidate.ptProng2(),
489498
candidate.invMassXicPlus(),
490-
candidate.invMassXi(),
491-
candidate.invMassLambda(),
492-
candidate.invMassXiPi0(),
493-
candidate.invMassXiPi1(),
494499
candidate.chi2PCA(),
495500
candidate.ct(o2::constants::physics::MassXiCPlus),
496501
candidate.kfDecayLength(),
@@ -503,13 +508,33 @@ struct HfTreeCreatorXicToXiPiPi {
503508
candidate.cpaXYXi(),
504509
candidate.cpaLambda(),
505510
candidate.cpaXYLambda(),
511+
candidate.cpaLambdaToXi(),
512+
candidate.cpaXYLambdaToXi(),
506513
candidate.impactParameter0(),
507514
candidate.impactParameterNormalised0(),
508515
candidate.impactParameter1(),
509516
candidate.impactParameterNormalised1(),
510517
candidate.impactParameter2(),
511518
candidate.impactParameterNormalised2(),
512519
candidate.maxNormalisedDeltaIP(),
520+
candidate.dcaXiDaughters(),
521+
candidate.dcaV0Daughters(),
522+
candidate.dcaXYCascToPV(),
523+
candidate.dcaZCascToPV(),
524+
candidate.dcaBachelorToPV(),
525+
candidate.dcaPosToPV(),
526+
candidate.dcaNegToPV(),
527+
// PID information
528+
candidate.nSigTpcPiFromXicPlus0(),
529+
candidate.nSigTpcPiFromXicPlus1(),
530+
candidate.nSigTpcBachelorPi(),
531+
candidate.nSigTpcPiFromLambda(),
532+
candidate.nSigTpcPrFromLambda(),
533+
candidate.nSigTofPiFromXicPlus0(),
534+
candidate.nSigTofPiFromXicPlus1(),
535+
candidate.nSigTofBachelorPi(),
536+
candidate.nSigTofPiFromLambda(),
537+
candidate.nSigTofPrFromLambda(),
513538
// KF-specific columns
514539
candidate.kfCascadeChi2(),
515540
candidate.kfV0Chi2(),
@@ -529,23 +554,17 @@ struct HfTreeCreatorXicToXiPiPi {
529554
candidate.dcaXYPi1Xi());
530555
} else {
531556
rowCandidateFullKf(
532-
flagMc,
557+
particleFlag,
533558
originMc,
534559
candidate.isSelXicToXiPiPi(),
535-
candidate.sign(),
536560
candidate.y(o2::constants::physics::MassXiCPlus),
537561
candidate.eta(),
538562
candidate.phi(),
539-
candidate.p(),
540563
candidate.pt(),
541564
candidate.ptProng0(),
542565
candidate.ptProng1(),
543566
candidate.ptProng2(),
544567
candidate.invMassXicPlus(),
545-
candidate.invMassXi(),
546-
candidate.invMassLambda(),
547-
candidate.invMassXiPi0(),
548-
candidate.invMassXiPi1(),
549568
candidate.chi2PCA(),
550569
candidate.ct(o2::constants::physics::MassXiCPlus),
551570
candidate.kfDecayLength(),
@@ -558,28 +577,34 @@ struct HfTreeCreatorXicToXiPiPi {
558577
candidate.cpaXYXi(),
559578
candidate.cpaLambda(),
560579
candidate.cpaXYLambda(),
580+
candidate.cpaLambdaToXi(),
581+
candidate.cpaXYLambdaToXi(),
561582
candidate.impactParameter0(),
562583
candidate.impactParameterNormalised0(),
563584
candidate.impactParameter1(),
564585
candidate.impactParameterNormalised1(),
565586
candidate.impactParameter2(),
566587
candidate.impactParameterNormalised2(),
567588
candidate.maxNormalisedDeltaIP(),
589+
candidate.dcaXiDaughters(),
590+
candidate.dcaV0Daughters(),
591+
candidate.dcaXYCascToPV(),
592+
candidate.dcaZCascToPV(),
593+
candidate.dcaBachelorToPV(),
594+
candidate.dcaPosToPV(),
595+
candidate.dcaNegToPV(),
568596
// additional columns only stored in the full candidate table
569-
candidate.cpaLambdaToXi(),
570-
candidate.cpaXYLambdaToXi(),
597+
candidate.invMassXi(),
598+
candidate.invMassXiPi0(),
599+
candidate.invMassXiPi1(),
600+
candidate.invMassLambda(),
601+
candidate.p(),
571602
candidate.pProng1(),
572603
candidate.pProng2(),
573604
candidate.pBachelorPi(),
574605
candidate.pPiFromLambda(),
575606
candidate.pPrFromLambda(),
576-
candidate.dcaXiDaughters(),
577-
candidate.dcaV0Daughters(),
578-
candidate.dcaPosToPV(),
579-
candidate.dcaNegToPV(),
580-
candidate.dcaBachelorToPV(),
581-
candidate.dcaXYCascToPV(),
582-
candidate.dcaZCascToPV(),
607+
// PID information
583608
candidate.nSigTpcPiFromXicPlus0(),
584609
candidate.nSigTpcPiFromXicPlus1(),
585610
candidate.nSigTpcBachelorPi(),

0 commit comments

Comments
 (0)