Skip to content

Commit a5a5073

Browse files
fcatalan92fcatalan92
authored
[PWGHF] Split PID tables for 2prong, 3prong, Dstar (#12652)
1 parent da09a1a commit a5a5073

File tree

4 files changed

+75
-43
lines changed

4 files changed

+75
-43
lines changed

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -722,36 +722,21 @@ DECLARE_SOA_TABLE(HfCand2ProngBase, "AOD", "HFCAND2PBASE", //!
722722
DECLARE_SOA_EXTENDED_TABLE_USER(HfCand2ProngExt, HfCand2ProngBase, "HFCAND2PEXT", //!
723723
hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz);
724724

725-
DECLARE_SOA_TABLE(HfProng0PidPi, "AOD", "HFP0PIDPI", //!
725+
DECLARE_SOA_TABLE(HfCand2Prong0PidPi, "AOD", "HFCAND2P0PIDPI", //!
726726
hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0,
727727
hf_cand::TpcTofNSigmaPi0<hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0>);
728-
DECLARE_SOA_TABLE(HfProng1PidPi, "AOD", "HFP1PIDPI", //!
728+
DECLARE_SOA_TABLE(HfCand2Prong1PidPi, "AOD", "HFCAND2P1PIDPI", //!
729729
hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1,
730730
hf_cand::TpcTofNSigmaPi1<hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1>);
731-
DECLARE_SOA_TABLE(HfProng2PidPi, "AOD", "HFP2PIDPI", //!
732-
hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2,
733-
hf_cand::TpcTofNSigmaPi2<hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2>);
734-
DECLARE_SOA_TABLE(HfProng0PidKa, "AOD", "HFP0PIDKA", //!
731+
DECLARE_SOA_TABLE(HfCand2Prong0PidKa, "AOD", "HFCAND2P0PIDKA", //!
735732
hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0,
736733
hf_cand::TpcTofNSigmaKa0<hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0>);
737-
DECLARE_SOA_TABLE(HfProng1PidKa, "AOD", "HFP1PIDKA", //!
734+
DECLARE_SOA_TABLE(HfCand2Prong1PidKa, "AOD", "HFCAND2P1PIDKA", //!
738735
hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1,
739736
hf_cand::TpcTofNSigmaKa1<hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1>);
740-
DECLARE_SOA_TABLE(HfProng2PidKa, "AOD", "HFP2PIDKA", //!
741-
hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2,
742-
hf_cand::TpcTofNSigmaKa2<hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2>);
743-
DECLARE_SOA_TABLE(HfProng0PidPr, "AOD", "HFP0PIDPR", //!
744-
hf_cand::NSigTpcPr0, hf_cand::NSigTofPr0,
745-
hf_cand::TpcTofNSigmaPr0<hf_cand::NSigTpcPr0, hf_cand::NSigTofPr0>);
746-
DECLARE_SOA_TABLE(HfProng1PidPr, "AOD", "HFP1PIDPR", //!
747-
hf_cand::NSigTpcPr1, hf_cand::NSigTofPr1,
748-
hf_cand::TpcTofNSigmaPr1<hf_cand::NSigTpcPr1, hf_cand::NSigTofPr1>);
749-
DECLARE_SOA_TABLE(HfProng2PidPr, "AOD", "HFP2PIDPR", //!
750-
hf_cand::NSigTpcPr2, hf_cand::NSigTofPr2,
751-
hf_cand::TpcTofNSigmaPr2<hf_cand::NSigTpcPr2, hf_cand::NSigTofPr2>);
752737

753738
using HfCand2Prong = HfCand2ProngExt;
754-
using HfCand2ProngWPid = soa::Join<HfCand2Prong, HfProng0PidPi, HfProng0PidKa, HfProng1PidPi, HfProng1PidKa>;
739+
using HfCand2ProngWPid = soa::Join<HfCand2Prong, HfCand2Prong0PidPi, HfCand2Prong0PidKa, HfCand2Prong1PidPi, HfCand2Prong1PidKa>;
755740

756741
DECLARE_SOA_TABLE(HfCand2ProngKF, "AOD", "HFCAND2PKF",
757742
hf_cand::KfTopolChi2OverNdf,
@@ -1089,9 +1074,37 @@ DECLARE_SOA_TABLE(HfCand3ProngBase, "AOD", "HFCAND3PBASE", //!
10891074
DECLARE_SOA_EXTENDED_TABLE_USER(HfCand3ProngExt, HfCand3ProngBase, "HFCAND3PEXT", //!
10901075
hf_cand_3prong::Px, hf_cand_3prong::Py, hf_cand_3prong::Pz);
10911076

1077+
DECLARE_SOA_TABLE(HfCand3Prong0PidPi, "AOD", "HFCAND3P0PIDPI", //!
1078+
hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0,
1079+
hf_cand::TpcTofNSigmaPi0<hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0>);
1080+
DECLARE_SOA_TABLE(HfCand3Prong1PidPi, "AOD", "HFCAND3P1PIDPI", //!
1081+
hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1,
1082+
hf_cand::TpcTofNSigmaPi1<hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1>);
1083+
DECLARE_SOA_TABLE(HfCand3Prong2PidPi, "AOD", "HFCAND3P2PIDPI", //!
1084+
hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2,
1085+
hf_cand::TpcTofNSigmaPi2<hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2>);
1086+
DECLARE_SOA_TABLE(HfCand3Prong0PidKa, "AOD", "HFCAND3P0PIDKA", //!
1087+
hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0,
1088+
hf_cand::TpcTofNSigmaKa0<hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0>);
1089+
DECLARE_SOA_TABLE(HfCand3Prong1PidKa, "AOD", "HFCAND3P1PIDKA", //!
1090+
hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1,
1091+
hf_cand::TpcTofNSigmaKa1<hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1>);
1092+
DECLARE_SOA_TABLE(HfCand3Prong2PidKa, "AOD", "HFCAND3P2PIDKA", //!
1093+
hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2,
1094+
hf_cand::TpcTofNSigmaKa2<hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2>);
1095+
DECLARE_SOA_TABLE(HfCand3Prong0PidPr, "AOD", "HFCAND3P0PIDPR", //!
1096+
hf_cand::NSigTpcPr0, hf_cand::NSigTofPr0,
1097+
hf_cand::TpcTofNSigmaPr0<hf_cand::NSigTpcPr0, hf_cand::NSigTofPr0>);
1098+
DECLARE_SOA_TABLE(HfCand3Prong1PidPr, "AOD", "HFCAND3P1PIDPR", //!
1099+
hf_cand::NSigTpcPr1, hf_cand::NSigTofPr1,
1100+
hf_cand::TpcTofNSigmaPr1<hf_cand::NSigTpcPr1, hf_cand::NSigTofPr1>);
1101+
DECLARE_SOA_TABLE(HfCand3Prong2PidPr, "AOD", "HFCAND3P2PIDPR", //!
1102+
hf_cand::NSigTpcPr2, hf_cand::NSigTofPr2,
1103+
hf_cand::TpcTofNSigmaPr2<hf_cand::NSigTpcPr2, hf_cand::NSigTofPr2>);
1104+
10921105
using HfCand3Prong = HfCand3ProngExt;
1093-
using HfCand3ProngWPidPiKaPr = soa::Join<HfCand3Prong, HfProng0PidPi, HfProng0PidPr, HfProng0PidKa, HfProng1PidPi, HfProng1PidPr, HfProng1PidKa, HfProng2PidPi, HfProng2PidPr, HfProng2PidKa>;
1094-
using HfCand3ProngWPidPiKa = soa::Join<HfCand3Prong, HfProng0PidPi, HfProng0PidKa, HfProng1PidPi, HfProng1PidKa, HfProng2PidPi, HfProng2PidKa>;
1106+
using HfCand3ProngWPidPiKaPr = soa::Join<HfCand3Prong, HfCand3Prong0PidPi, HfCand3Prong0PidPr, HfCand3Prong0PidKa, HfCand3Prong1PidPi, HfCand3Prong1PidPr, HfCand3Prong1PidKa, HfCand3Prong2PidPi, HfCand3Prong2PidPr, HfCand3Prong2PidKa>;
1107+
using HfCand3ProngWPidPiKa = soa::Join<HfCand3Prong, HfCand3Prong0PidPi, HfCand3Prong0PidKa, HfCand3Prong1PidPi, HfCand3Prong1PidKa, HfCand3Prong2PidPi, HfCand3Prong2PidKa>;
10951108

10961109
DECLARE_SOA_TABLE(HfCand3ProngKF, "AOD", "HFCAND3PKF",
10971110
hf_cand_3prong::KfXError, hf_cand_3prong::KfYError, hf_cand_3prong::KfZError,
@@ -2812,8 +2825,27 @@ DECLARE_SOA_TABLE(HfD0FromDstarBase, "AOD", "HFD0FRMDSTR",
28122825
DECLARE_SOA_EXTENDED_TABLE_USER(HfD0FromDstarExt, HfD0FromDstarBase, "HFD0FRMDSTREXT",
28132826
hf_cand_dstar::PxD0, hf_cand_dstar::PyD0, hf_cand_dstar::PzD0);
28142827

2828+
DECLARE_SOA_TABLE(HfCandDstarProng0PidPi, "AOD", "HFDSTRP0PIDPI", //!
2829+
hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0,
2830+
hf_cand::TpcTofNSigmaPi0<hf_cand::NSigTpcPi0, hf_cand::NSigTofPi0>);
2831+
DECLARE_SOA_TABLE(HfCandDstarProng1PidPi, "AOD", "HFDSTRP1PIDPI", //!
2832+
hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1,
2833+
hf_cand::TpcTofNSigmaPi1<hf_cand::NSigTpcPi1, hf_cand::NSigTofPi1>);
2834+
DECLARE_SOA_TABLE(HfCandDstarProng2PidPi, "AOD", "HFDSTRP2PIDPI", //!
2835+
hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2,
2836+
hf_cand::TpcTofNSigmaPi2<hf_cand::NSigTpcPi2, hf_cand::NSigTofPi2>);
2837+
DECLARE_SOA_TABLE(HfCandDstarProng0PidKa, "AOD", "HFDSTRP0PIDKA", //!
2838+
hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0,
2839+
hf_cand::TpcTofNSigmaKa0<hf_cand::NSigTpcKa0, hf_cand::NSigTofKa0>);
2840+
DECLARE_SOA_TABLE(HfCandDstarProng1PidKa, "AOD", "HFDSTRP1PIDKA", //!
2841+
hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1,
2842+
hf_cand::TpcTofNSigmaKa1<hf_cand::NSigTpcKa1, hf_cand::NSigTofKa1>);
2843+
DECLARE_SOA_TABLE(HfCandDstarProng2PidKa, "AOD", "HFDSTRP2PIDKA", //!
2844+
hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2,
2845+
hf_cand::TpcTofNSigmaKa2<hf_cand::NSigTpcKa2, hf_cand::NSigTofKa2>);
2846+
28152847
using HfD0FromDstar = HfD0FromDstarExt;
2816-
using HfD0FromDstarWPid = soa::Join<HfD0FromDstar, HfProng0PidPi, HfProng0PidKa, HfProng1PidPi, HfProng1PidKa>;
2848+
using HfD0FromDstarWPid = soa::Join<HfD0FromDstar, HfCandDstarProng0PidPi, HfCandDstarProng0PidKa, HfCandDstarProng1PidPi, HfCandDstarProng1PidKa>;
28172849

28182850
DECLARE_SOA_TABLE(HfCandDstarBase, "AOD", "HFCANDDSTRBASE",
28192851
o2::soa::Index<>,
@@ -2864,7 +2896,7 @@ DECLARE_SOA_EXTENDED_TABLE_USER(HfCandDstarExt, HfCandDstarBase, "HFCANDDSTREXT"
28642896

28652897
using HfCandDstars = HfCandDstarExt;
28662898
using HfCandDstar = HfCandDstars::iterator;
2867-
using HfCandDstarsWPid = soa::Join<HfCandDstars, HfProng0PidPi, HfProng0PidKa, HfProng1PidPi, HfProng1PidKa, /*soft pion*/ HfProng2PidPi, /*soft pion*/ HfProng2PidKa>;
2899+
using HfCandDstarsWPid = soa::Join<HfCandDstars, HfCandDstarProng0PidPi, HfCandDstarProng0PidKa, HfCandDstarProng1PidPi, HfCandDstarProng1PidKa, /*soft pion*/ HfCandDstarProng2PidPi, /*soft pion*/ HfCandDstarProng2PidKa>;
28682900

28692901
// table with results of reconstruction level MC matching
28702902
DECLARE_SOA_TABLE(HfCandDstarMcRec, "AOD", "HFCANDDSTRMCREC",

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ using namespace o2::aod::pid_tpc_tof_utils;
8989
/// Reconstruction of heavy-flavour 2-prong decay candidates
9090
struct HfCandidateCreator2Prong {
9191
Produces<aod::HfCand2ProngBase> rowCandidateBase;
92-
Produces<aod::HfProng0PidPi> rowProng0PidPi;
93-
Produces<aod::HfProng0PidKa> rowProng0PidKa;
94-
Produces<aod::HfProng1PidPi> rowProng1PidPi;
95-
Produces<aod::HfProng1PidKa> rowProng1PidKa;
9692
Produces<aod::HfCand2ProngKF> rowCandidateKF;
93+
Produces<aod::HfCand2Prong0PidPi> rowProng0PidPi;
94+
Produces<aod::HfCand2Prong0PidKa> rowProng0PidKa;
95+
Produces<aod::HfCand2Prong1PidPi> rowProng1PidPi;
96+
Produces<aod::HfCand2Prong1PidKa> rowProng1PidKa;
9797

9898
// vertexing
9999
Configurable<bool> constrainKfToPv{"constrainKfToPv", true, "constraint KFParticle to PV"};

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ using namespace o2::aod::pid_tpc_tof_utils;
9191
struct HfCandidateCreator3Prong {
9292
Produces<aod::HfCand3ProngBase> rowCandidateBase;
9393
Produces<aod::HfCand3ProngKF> rowCandidateKF;
94-
Produces<aod::HfProng0PidPi> rowProng0PidPi;
95-
Produces<aod::HfProng0PidKa> rowProng0PidKa;
96-
Produces<aod::HfProng0PidPr> rowProng0PidPr;
97-
Produces<aod::HfProng1PidPi> rowProng1PidPi;
98-
Produces<aod::HfProng1PidKa> rowProng1PidKa;
99-
Produces<aod::HfProng1PidPr> rowProng1PidPr;
100-
Produces<aod::HfProng2PidPi> rowProng2PidPi;
101-
Produces<aod::HfProng2PidKa> rowProng2PidKa;
102-
Produces<aod::HfProng2PidPr> rowProng2PidPr;
94+
Produces<aod::HfCand3Prong0PidPi> rowProng0PidPi;
95+
Produces<aod::HfCand3Prong0PidKa> rowProng0PidKa;
96+
Produces<aod::HfCand3Prong0PidPr> rowProng0PidPr;
97+
Produces<aod::HfCand3Prong1PidPi> rowProng1PidPi;
98+
Produces<aod::HfCand3Prong1PidKa> rowProng1PidKa;
99+
Produces<aod::HfCand3Prong1PidPr> rowProng1PidPr;
100+
Produces<aod::HfCand3Prong2PidPi> rowProng2PidPi;
101+
Produces<aod::HfCand3Prong2PidKa> rowProng2PidKa;
102+
Produces<aod::HfCand3Prong2PidPr> rowProng2PidPr;
103103

104104
// vertexing
105105
Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ using HfDstarsWithPvRefitInfo = soa::Join<aod::HfDstars, aod::HfPvRefitDstar>;
7777
struct HfCandidateCreatorDstar {
7878
Produces<aod::HfD0FromDstarBase> rowCandD0Base;
7979
Produces<aod::HfCandDstarBase> rowCandDstarBase;
80-
Produces<aod::HfProng0PidPi> rowProng0PidPi;
81-
Produces<aod::HfProng0PidKa> rowProng0PidKa;
82-
Produces<aod::HfProng1PidPi> rowProng1PidPi;
83-
Produces<aod::HfProng1PidKa> rowProng1PidKa;
84-
Produces<aod::HfProng2PidPi> rowProngSoftPiPidPi;
85-
Produces<aod::HfProng2PidKa> rowProngSoftPiPidKa;
80+
Produces<aod::HfCandDstarProng0PidPi> rowProng0PidPi;
81+
Produces<aod::HfCandDstarProng0PidKa> rowProng0PidKa;
82+
Produces<aod::HfCandDstarProng1PidPi> rowProng1PidPi;
83+
Produces<aod::HfCandDstarProng1PidKa> rowProng1PidKa;
84+
Produces<aod::HfCandDstarProng2PidPi> rowProngSoftPiPidPi;
85+
Produces<aod::HfCandDstarProng2PidKa> rowProngSoftPiPidKa;
8686

8787
Configurable<bool> fillHistograms{"fillHistograms", true, "fill histograms"};
8888

0 commit comments

Comments
 (0)