Skip to content

Commit 14caf9e

Browse files
pstahlhupstahlhu
authored
[PWGHF] XicToXiPiPi: Update output table structures (#10177)
Co-authored-by: pstahlhu <phil.lennart.stahlhut@cern.ch>
1 parent a08e2ee commit 14caf9e

File tree

3 files changed

+44
-49
lines changed

3 files changed

+44
-49
lines changed

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,8 +1743,7 @@ DECLARE_SOA_TABLE(HfCandXicKF, "AOD", "HFCANDXICKF",
17431743
cascdata::KFCascadeChi2, cascdata::KFV0Chi2,
17441744
hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPVBeforeConstraint, hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPV, hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlusBeforeConstraint, hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlus,
17451745
hf_cand_xic_to_xi_pi_pi::DcaXYPi0Pi1, hf_cand_xic_to_xi_pi_pi::DcaXYPi0Xi, hf_cand_xic_to_xi_pi_pi::DcaXYPi1Xi,
1746-
hf_cand_xic_to_xi_pi_pi::DcaPi0Pi1, hf_cand_xic_to_xi_pi_pi::DcaPi0Xi, hf_cand_xic_to_xi_pi_pi::DcaPi1Xi,
1747-
cascdata::DCACascDaughters);
1746+
hf_cand_xic_to_xi_pi_pi::DcaPi0Pi1, hf_cand_xic_to_xi_pi_pi::DcaPi0Xi, hf_cand_xic_to_xi_pi_pi::DcaPi1Xi);
17481747

17491748
// table with results of reconstruction level MC matching
17501749
DECLARE_SOA_TABLE(HfCandXicMcRec, "AOD", "HFCANDXICMCREC", //!

‎PWGHF/TableProducer/candidateCreatorXicToXiPiPi.cxx‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
///
1515
/// \author Phil Lennart Stahlhut <phil.lennart.stahlhut@cern.ch>, Heidelberg University
1616
/// \author Carolina Reetz <c.reetz@cern.ch>, Heidelberg University
17+
/// \author Jaeyoon Cho <jaeyoon.cho@cern.ch>, Inha University
1718
/// \author Jinjoo Seo <jseo@cern.ch>, Heidelberg University
1819

1920
#ifndef HomogeneousField
@@ -178,7 +179,9 @@ struct HfCandidateCreatorXicToXiPiPi {
178179
auto trackCharmBachelor0 = rowTrackIndexXicPlus.prong0_as<TracksWCovDcaPidPrPi>();
179180
auto trackCharmBachelor1 = rowTrackIndexXicPlus.prong1_as<TracksWCovDcaPidPrPi>();
180181
auto collision = rowTrackIndexXicPlus.collision();
181-
registry.fill(HIST("hCandCounter"), 1 + AllIdTriplets);
182+
if (fillHistograms) {
183+
registry.fill(HIST("hCandCounter"), 1 + AllIdTriplets);
184+
}
182185

183186
// preselect cascade candidates
184187
if (doCascadePreselection) {
@@ -189,7 +192,9 @@ struct HfCandidateCreatorXicToXiPiPi {
189192
continue;
190193
}
191194
}
192-
registry.fill(HIST("hCandCounter"), 1 + CascPreSel);
195+
if (fillHistograms) {
196+
registry.fill(HIST("hCandCounter"), 1 + CascPreSel);
197+
}
193198

194199
//----------------------Set the magnetic field from ccdb---------------------------------------
195200
/// The static instance of the propagator was already modified in the HFTrackIndexSkimCreator,
@@ -241,7 +246,9 @@ struct HfCandidateCreatorXicToXiPiPi {
241246
LOG(info) << "Run time error found: " << error.what() << ". DCAFitterN cannot work, skipping the candidate.";
242247
continue;
243248
}
244-
registry.fill(HIST("hCandCounter"), 1 + VertexFit);
249+
if (fillHistograms) {
250+
registry.fill(HIST("hCandCounter"), 1 + VertexFit);
251+
}
245252

246253
//----------------------------calculate physical properties-----------------------
247254
// Charge of charm baryon
@@ -399,7 +406,9 @@ struct HfCandidateCreatorXicToXiPiPi {
399406
auto trackCharmBachelor0 = rowTrackIndexXicPlus.prong0_as<TracksWCovExtraPidPrPi>();
400407
auto trackCharmBachelor1 = rowTrackIndexXicPlus.prong1_as<TracksWCovExtraPidPrPi>();
401408
auto collision = rowTrackIndexXicPlus.collision();
402-
registry.fill(HIST("hCandCounter"), 1 + AllIdTriplets);
409+
if (fillHistograms) {
410+
registry.fill(HIST("hCandCounter"), 1 + AllIdTriplets);
411+
}
403412

404413
//-------------------preselect cascade candidates--------------------------------------
405414
if (doCascadePreselection) {
@@ -410,7 +419,9 @@ struct HfCandidateCreatorXicToXiPiPi {
410419
continue;
411420
}
412421
}
413-
registry.fill(HIST("hCandCounter"), 1 + CascPreSel);
422+
if (fillHistograms) {
423+
registry.fill(HIST("hCandCounter"), 1 + CascPreSel);
424+
}
414425

415426
//----------------------Set the magnetic field from ccdb-----------------------------
416427
/// The static instance of the propagator was already modified in the HFTrackIndexSkimCreator,
@@ -464,7 +475,9 @@ struct HfCandidateCreatorXicToXiPiPi {
464475
LOG(debug) << "Failed to construct XicPlus : " << e.what();
465476
continue;
466477
}
467-
registry.fill(HIST("hCandCounter"), 1 + VertexFit);
478+
if (fillHistograms) {
479+
registry.fill(HIST("hCandCounter"), 1 + VertexFit);
480+
}
468481

469482
// get geometrical chi2 of XicPlus
470483
float chi2GeoXicPlus = kfXicPlus.GetChi2() / kfXicPlus.GetNDF();
@@ -645,8 +658,7 @@ struct HfCandidateCreatorXicToXiPiPi {
645658
rowCandidateKF(casc.kfCascadeChi2(), casc.kfV0Chi2(),
646659
chi2topoXicPlusToPVBeforeConstraint, chi2topoXicPlusToPV, chi2topoXiToXicPlusBeforeConstraint, chi2topoXiToXicPlus,
647660
dcaXYPi0Pi1, dcaXYPi0Xi, dcaXYPi1Xi,
648-
dcaPi0Pi1, dcaPi0Xi, dcaPi1Xi,
649-
casc.dcacascdaughters());
661+
dcaPi0Pi1, dcaPi0Xi, dcaPi1Xi);
650662
} // loop over track triplets
651663
}
652664
PROCESS_SWITCH(HfCandidateCreatorXicToXiPiPi, processXicplusWithKFParticle, "Run candidate creator with KFParticle using derived data from HfTrackIndexSkimCreatorLfCascades.", false);

‎PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
///
1515
/// \author Phil Lennart Stahlhut <phil.lennart.stahlhut@cern.ch>, Heidelberg University
1616
/// \author Carolina Reetz <c.reetz@cern.ch>, Heidelberg University
17+
/// \author Jaeyoon Cho <jaeyoon.cho@cern.ch>, Inha University
1718

1819
#include <vector>
1920

@@ -35,12 +36,6 @@ namespace full
3536
{
3637
DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int); //! Selection flag of candidate (output of candidateSelector)
3738
// vertices
38-
DECLARE_SOA_COLUMN(XPvErr, xPvErr, float);
39-
DECLARE_SOA_COLUMN(YPvErr, yPvErr, float);
40-
DECLARE_SOA_COLUMN(ZPvErr, zPvErr, float);
41-
DECLARE_SOA_COLUMN(XSvErr, xSvErr, float);
42-
DECLARE_SOA_COLUMN(YSvErr, ySvErr, float);
43-
DECLARE_SOA_COLUMN(ZSvErr, zSvErr, float);
4439
DECLARE_SOA_COLUMN(Chi2Sv, chi2Sv, float);
4540
DECLARE_SOA_COLUMN(Chi2XiVtx, chi2XiVtx, float);
4641
DECLARE_SOA_COLUMN(Chi2LamVtx, chi2LamVtx, float);
@@ -89,7 +84,6 @@ DECLARE_SOA_COLUMN(DcaXYPi1Xi, dcaXYPi1Xi, float);
8984
DECLARE_SOA_COLUMN(DcaPi0Pi1, dcaPi0Pi1, float);
9085
DECLARE_SOA_COLUMN(DcaPi0Xi, dcaPi0Xi, float);
9186
DECLARE_SOA_COLUMN(DcaPi1Xi, dcaPi1Xi, float);
92-
DECLARE_SOA_COLUMN(DcaXiDaughters, dcaXiDaughters, float);
9387
DECLARE_SOA_COLUMN(InvMassXi, invMassXi, float);
9488
DECLARE_SOA_COLUMN(InvMassLambda, invMassLambda, float);
9589
DECLARE_SOA_COLUMN(InvMassXiPi0, invMassXiPi0, float);
@@ -169,6 +163,7 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiLiteKfs, "AOD", "HFXICXI2PILITKF",
169163
full::PtPi1,
170164
full::M,
171165
full::InvMassXi,
166+
full::InvMassLambda,
172167
full::InvMassXiPi0,
173168
full::InvMassXiPi1,
174169
full::Chi2Sv,
@@ -202,8 +197,7 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiLiteKfs, "AOD", "HFXICXI2PILITKF",
202197
full::DcaXYPi1Xi,
203198
full::DcaPi0Pi1,
204199
full::DcaPi0Xi,
205-
full::DcaPi1Xi,
206-
full::DcaXiDaughters);
200+
full::DcaPi1Xi);
207201

208202
DECLARE_SOA_TABLE(HfCandXicToXiPiPiFulls, "AOD", "HFXICXI2PIFULL",
209203
hf_cand_xic_to_xi_pi_pi::FlagMcMatchRec,
@@ -244,12 +238,6 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFulls, "AOD", "HFXICXI2PIFULL",
244238
full::ImpactParameterNormalisedPi1,
245239
full::MaxNormalisedDeltaIP,
246240
// additional columns only stored in the full candidate table
247-
full::XPvErr,
248-
full::YPvErr,
249-
full::ZPvErr,
250-
full::XSvErr,
251-
full::YSvErr,
252-
full::ZSvErr,
253241
full::CpaLamToXi,
254242
full::CpaXYLamToXi,
255243
full::PPi0,
@@ -291,6 +279,7 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullKfs, "AOD", "HFXICXI2PIFULKF",
291279
full::PtPi1,
292280
full::M,
293281
full::InvMassXi,
282+
full::InvMassLambda,
294283
full::InvMassXiPi0,
295284
full::InvMassXiPi1,
296285
full::Chi2Sv,
@@ -313,19 +302,20 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullKfs, "AOD", "HFXICXI2PIFULKF",
313302
full::ImpactParameterNormalisedPi1,
314303
full::MaxNormalisedDeltaIP,
315304
// additional columns only stored in the full candidate table
316-
full::XPvErr,
317-
full::YPvErr,
318-
full::ZPvErr,
319-
full::XSvErr,
320-
full::YSvErr,
321-
full::ZSvErr,
322305
full::CpaLamToXi,
323306
full::CpaXYLamToXi,
324307
full::PPi0,
325308
full::PPi1,
326309
full::PBachelorPi,
327310
full::PPiFromLambda,
328311
full::PPrFromLambda,
312+
hf_cand_xic_to_xi_pi_pi::DcaXiDaughters,
313+
hf_cand_xic_to_xi_pi_pi::DcaV0Daughters,
314+
hf_cand_xic_to_xi_pi_pi::DcaPosToPV,
315+
hf_cand_xic_to_xi_pi_pi::DcaNegToPV,
316+
hf_cand_xic_to_xi_pi_pi::DcaBachelorToPV,
317+
hf_cand_xic_to_xi_pi_pi::DcaXYCascToPV,
318+
hf_cand_xic_to_xi_pi_pi::DcaZCascToPV,
329319
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus0,
330320
hf_cand_xic_to_xi_pi_pi::NSigTpcPiFromXicPlus1,
331321
hf_cand_xic_to_xi_pi_pi::NSigTpcBachelorPi,
@@ -348,8 +338,7 @@ DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullKfs, "AOD", "HFXICXI2PIFULKF",
348338
full::DcaXYPi1Xi,
349339
full::DcaPi0Pi1,
350340
full::DcaPi0Xi,
351-
full::DcaPi1Xi,
352-
full::DcaXiDaughters);
341+
full::DcaPi1Xi);
353342

354343
DECLARE_SOA_TABLE(HfCandXicToXiPiPiFullPs, "AOD", "HFXICXI2PIFULLP",
355344
hf_cand_xic_to_xi_pi_pi::FlagMcMatchGen,
@@ -503,12 +492,6 @@ struct HfTreeCreatorXicToXiPiPi {
503492
candidate.impactParameterNormalised2(),
504493
candidate.maxNormalisedDeltaIP(),
505494
// additional columns only stored in the full candidate table
506-
candidate.xPvErr(),
507-
candidate.yPvErr(),
508-
candidate.zPvErr(),
509-
candidate.xSvErr(),
510-
candidate.ySvErr(),
511-
candidate.zSvErr(),
512495
candidate.cosPaLambdaToXi(),
513496
candidate.cosPaXYLambdaToXi(),
514497
candidate.pProng1(),
@@ -552,6 +535,7 @@ struct HfTreeCreatorXicToXiPiPi {
552535
candidate.ptProng2(),
553536
candidate.invMassXicPlus(),
554537
candidate.invMassXi(),
538+
candidate.invMassLambda(),
555539
candidate.invMassXiPi0(),
556540
candidate.invMassXiPi1(),
557541
candidate.chi2PCA(),
@@ -585,8 +569,7 @@ struct HfTreeCreatorXicToXiPiPi {
585569
candidate.dcaXYPi1Xi(),
586570
candidate.dcaPi0Pi1(),
587571
candidate.dcaPi0Xi(),
588-
candidate.dcaPi1Xi(),
589-
candidate.dcacascdaughters());
572+
candidate.dcaPi1Xi());
590573
} else {
591574
rowCandidateFullKf(
592575
flagMc,
@@ -604,6 +587,7 @@ struct HfTreeCreatorXicToXiPiPi {
604587
candidate.ptProng2(),
605588
candidate.invMassXicPlus(),
606589
candidate.invMassXi(),
590+
candidate.invMassLambda(),
607591
candidate.invMassXiPi0(),
608592
candidate.invMassXiPi1(),
609593
candidate.chi2PCA(),
@@ -626,19 +610,20 @@ struct HfTreeCreatorXicToXiPiPi {
626610
candidate.impactParameterNormalised2(),
627611
candidate.maxNormalisedDeltaIP(),
628612
// additional columns only stored in the full candidate table
629-
candidate.xPvErr(),
630-
candidate.yPvErr(),
631-
candidate.zPvErr(),
632-
candidate.xSvErr(),
633-
candidate.ySvErr(),
634-
candidate.zSvErr(),
635613
candidate.cosPaLambdaToXi(),
636614
candidate.cosPaXYLambdaToXi(),
637615
candidate.pProng1(),
638616
candidate.pProng2(),
639617
candidate.pBachelorPi(),
640618
candidate.pPiFromLambda(),
641619
candidate.pPrFromLambda(),
620+
candidate.dcaXiDaughters(),
621+
candidate.dcaV0Daughters(),
622+
candidate.dcaPosToPV(),
623+
candidate.dcaNegToPV(),
624+
candidate.dcaBachelorToPV(),
625+
candidate.dcaXYCascToPV(),
626+
candidate.dcaZCascToPV(),
642627
candidate.nSigTpcPiFromXicPlus0(),
643628
candidate.nSigTpcPiFromXicPlus1(),
644629
candidate.nSigTpcBachelorPi(),
@@ -661,8 +646,7 @@ struct HfTreeCreatorXicToXiPiPi {
661646
candidate.dcaXYPi1Xi(),
662647
candidate.dcaPi0Pi1(),
663648
candidate.dcaPi0Xi(),
664-
candidate.dcaPi1Xi(),
665-
candidate.dcacascdaughters());
649+
candidate.dcaPi1Xi());
666650
}
667651
}
668652
}

0 commit comments

Comments
 (0)