Skip to content

Commit b0eedc5

Browse files
jesgumjesgum
authored
[ALICE3] Modularise multi-charm task (#11441)
1 parent 4d9fcc5 commit b0eedc5

File tree

5 files changed

+421
-112
lines changed

5 files changed

+421
-112
lines changed

‎ALICE3/DataModel/OTFMulticharm.h‎

Lines changed: 127 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
// or submit itself to any jurisdiction.
1111

1212
///
13-
/// \file OTFStrangeness.h
13+
/// \file OTFMulticharm.h
1414
/// \author David Dobrigkeit Chinellato
15+
/// \author Jesper Karlsson Gumprecht
1516
/// \since 05/08/2024
16-
/// \brief Set of tables for the ALICE3 strangeness information
17+
/// \brief Set of tables for the ALICE3 multi-charm information
1718
///
1819

1920
#ifndef ALICE3_DATAMODEL_OTFMULTICHARM_H_
@@ -31,45 +32,72 @@ DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion1, xiCPion1, int, Tracks, "_Pi1XiC");
3132
DECLARE_SOA_INDEX_COLUMN_FULL(XiCPion2, xiCPion2, int, Tracks, "_Pi2XiC");
3233
DECLARE_SOA_INDEX_COLUMN_FULL(XiCCPion, xiCCPion, int, Tracks, "_PiXiCC");
3334

34-
// topo vars
35-
DECLARE_SOA_COLUMN(DCAXiCDaughters, dcaXiCDaughters, float);
36-
DECLARE_SOA_COLUMN(DCAXiCCDaughters, dcaXiCCDaughters, float);
37-
38-
DECLARE_SOA_COLUMN(MXiC, mXiC, float);
39-
DECLARE_SOA_COLUMN(MXiCC, mXiCC, float);
35+
DECLARE_SOA_COLUMN(XicMass, xicMass, float);
36+
DECLARE_SOA_COLUMN(XiccMass, xiccMass, float);
4037

4138
// kine vars
4239
DECLARE_SOA_COLUMN(Pt, pt, float);
4340
DECLARE_SOA_COLUMN(Eta, eta, float);
4441

45-
// tracking counters
46-
DECLARE_SOA_COLUMN(NSiliconHitsXi, nSiliconHitsXi, int);
47-
DECLARE_SOA_COLUMN(NSiliconHitsPiFromXi, nSiliconHitsPiFromXi, int);
48-
DECLARE_SOA_COLUMN(NSiliconHitsPiFromLa, nSiliconHitsPiFromLa, int);
49-
DECLARE_SOA_COLUMN(NSiliconHitsPrFromLa, nSiliconHitsPrFromLa, int);
50-
DECLARE_SOA_COLUMN(NSiliconHitsPiC1, nSiliconHitsPiC1, int);
51-
DECLARE_SOA_COLUMN(NSiliconHitsPiC2, nSiliconHitsPiC2, int);
52-
DECLARE_SOA_COLUMN(NSiliconHitsPiCC, nSiliconHitsPiCC, int);
53-
54-
DECLARE_SOA_COLUMN(NTPCHitsPiFromXi, nTPCHitsPiFromXi, int);
55-
DECLARE_SOA_COLUMN(NTPCHitsPiFromLa, nTPCHitsPiFromLa, int);
56-
DECLARE_SOA_COLUMN(NTPCHitsPrFromLa, nTPCHitsPrFromLa, int);
57-
DECLARE_SOA_COLUMN(NTPCHitsPiC1, nTPCHitsPiC1, int);
58-
DECLARE_SOA_COLUMN(NTPCHitsPiC2, nTPCHitsPiC2, int);
59-
DECLARE_SOA_COLUMN(NTPCHitsPiCC, nTPCHitsPiCC, int);
60-
61-
// DCA to PV variables
62-
DECLARE_SOA_COLUMN(DCAToPVXi, dcaToPVXi, float);
63-
DECLARE_SOA_COLUMN(DCAToPVXiC, dcaToPVXiC, float);
64-
DECLARE_SOA_COLUMN(DCAToPVXiCC, dcaToPVXiCC, float);
65-
66-
DECLARE_SOA_COLUMN(DCAToPVPiFromXi, dcaToPVPiFromXi, float);
67-
DECLARE_SOA_COLUMN(DCAToPVPiFromLa, dcaToPVPiFromLa, float);
68-
DECLARE_SOA_COLUMN(DCAToPVPrFromLa, dcaToPVPrFromLa, float);
69-
70-
DECLARE_SOA_COLUMN(DCAToPVPiC1, dcaToPVPiC1, float);
71-
DECLARE_SOA_COLUMN(DCAToPVPiC2, dcaToPVPiC2, float);
72-
DECLARE_SOA_COLUMN(DCAToPVPiCC, dcaToPVPiCC, float);
42+
// topo vars
43+
DECLARE_SOA_COLUMN(XiDCAz, xiDCAz, float);
44+
DECLARE_SOA_COLUMN(XiDCAxy, xiDCAxy, float);
45+
DECLARE_SOA_COLUMN(XicDauDCA, xicDauDCA, float);
46+
DECLARE_SOA_COLUMN(XicDCAxy, xicDCAxy, float);
47+
DECLARE_SOA_COLUMN(XicDCAz, xicDCAz, float);
48+
DECLARE_SOA_COLUMN(XiccDauDCA, xiccDauDCA, float);
49+
DECLARE_SOA_COLUMN(XiccDCAxy, xiccDCAxy, float);
50+
DECLARE_SOA_COLUMN(XiccDCAz, xiccDCAz, float);
51+
52+
DECLARE_SOA_COLUMN(PiFromXiDCAxy, piFromXiDCAxy, float);
53+
DECLARE_SOA_COLUMN(PiFromLaDCAxy, piFromLaDCAxy, float);
54+
DECLARE_SOA_COLUMN(PrFromLaDCAxy, prFromLaDCAxy, float);
55+
DECLARE_SOA_COLUMN(PiFromXiDCAz, piFromXiDCAz, float);
56+
DECLARE_SOA_COLUMN(PiFromLaDCAz, piFromLaDCAz, float);
57+
DECLARE_SOA_COLUMN(PrFromLaDCAz, prFromLaDCAz, float);
58+
59+
DECLARE_SOA_COLUMN(Pi1cDCAxy, pi1cDCAxy, float);
60+
DECLARE_SOA_COLUMN(Pi2cDCAxy, pi2cDCAxy, float);
61+
DECLARE_SOA_COLUMN(PiccDCAxy, piccDCAxy, float);
62+
DECLARE_SOA_COLUMN(Pi1cDCAz, pi1cDCAz, float);
63+
DECLARE_SOA_COLUMN(Pi2cDCAz, pi2cDCAz, float);
64+
DECLARE_SOA_COLUMN(PiccDCAz, piccDCAz, float);
65+
66+
// Lengths
67+
DECLARE_SOA_COLUMN(XicDecayRadius2D, xicDecayRadius2D, float);
68+
DECLARE_SOA_COLUMN(XiccDecayRadius2D, xiccDecayRadius2D, float);
69+
DECLARE_SOA_COLUMN(XicProperLength, xicProperLength, float);
70+
DECLARE_SOA_COLUMN(XicDistanceFromPV, xicDistanceFromPV, float);
71+
DECLARE_SOA_COLUMN(XiccProperLength, xiccProperLength, float);
72+
73+
// PID
74+
DECLARE_SOA_COLUMN(Pi1cTofDeltaInner, pi1cTofDeltaInner, float);
75+
DECLARE_SOA_COLUMN(Pi1cTofNSigmaInner, pi1cTofNSigmaInner, float);
76+
DECLARE_SOA_COLUMN(Pi1cTofDeltaOuter, pi1cTofDeltaOuter, float);
77+
DECLARE_SOA_COLUMN(Pi1cTofNSigmaOuter, pi1cTofNSigmaOuter, float);
78+
DECLARE_SOA_COLUMN(Pi2cTofDeltaInner, pi2cTofDeltaInner, float);
79+
DECLARE_SOA_COLUMN(Pi2cTofNSigmaInner, pi2cTofNSigmaInner, float);
80+
DECLARE_SOA_COLUMN(Pi2cTofDeltaOuter, pi2cTofDeltaOuter, float);
81+
DECLARE_SOA_COLUMN(Pi2cTofNSigmaOuter, pi2cTofNSigmaOuter, float);
82+
DECLARE_SOA_COLUMN(PiccTofDeltaInner, piccTofDeltaInner, float);
83+
DECLARE_SOA_COLUMN(PiccTofNSigmaInner, piccTofNSigmaInner, float);
84+
DECLARE_SOA_COLUMN(PiccTofDeltaOuter, piccTofDeltaOuter, float);
85+
DECLARE_SOA_COLUMN(PiccTofNSigmaOuter, piccTofNSigmaOuter, float);
86+
87+
// Daughter info
88+
DECLARE_SOA_COLUMN(PosPt, posPt, float);
89+
DECLARE_SOA_COLUMN(PosEta, posEta, float);
90+
DECLARE_SOA_COLUMN(NegPt, negPt, float);
91+
DECLARE_SOA_COLUMN(NegEta, negEta, float);
92+
DECLARE_SOA_COLUMN(BachPt, bachPt, float);
93+
DECLARE_SOA_COLUMN(BachEta, bachEta, float);
94+
DECLARE_SOA_COLUMN(BachPhi, bachPhi, float);
95+
DECLARE_SOA_COLUMN(Pi1cPt, pi1cPt, float);
96+
DECLARE_SOA_COLUMN(Pi1cEta, pi1cEta, float);
97+
DECLARE_SOA_COLUMN(Pi2cPt, pi2cPt, float);
98+
DECLARE_SOA_COLUMN(Pi2cEta, pi2cEta, float);
99+
DECLARE_SOA_COLUMN(PiccPt, piccPt, float);
100+
DECLARE_SOA_COLUMN(PiccEta, piccEta, float);
73101

74102
} // namespace otfmulticharm
75103
DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
@@ -80,36 +108,72 @@ DECLARE_SOA_TABLE(MCharmIndices, "AOD", "MCharmIndices",
80108
otfmulticharm::XiCCPionId);
81109

82110
DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
83-
otfmulticharm::DCAXiCDaughters,
84-
otfmulticharm::DCAXiCCDaughters,
85-
otfmulticharm::MXiC,
86-
otfmulticharm::MXiCC,
111+
otfmulticharm::XicDauDCA,
112+
otfmulticharm::XiccDauDCA,
113+
otfmulticharm::XicMass,
114+
otfmulticharm::XiccMass,
87115
otfmulticharm::Pt,
88116
otfmulticharm::Eta,
89117

90-
otfmulticharm::NSiliconHitsXi,
91-
otfmulticharm::NSiliconHitsPiFromXi,
92-
otfmulticharm::NSiliconHitsPiFromLa,
93-
otfmulticharm::NSiliconHitsPrFromLa,
94-
otfmulticharm::NSiliconHitsPiC1,
95-
otfmulticharm::NSiliconHitsPiC2,
96-
otfmulticharm::NSiliconHitsPiCC,
97-
otfmulticharm::NTPCHitsPiFromXi,
98-
otfmulticharm::NTPCHitsPiFromLa,
99-
otfmulticharm::NTPCHitsPrFromLa,
100-
otfmulticharm::NTPCHitsPiC1,
101-
otfmulticharm::NTPCHitsPiC2,
102-
otfmulticharm::NTPCHitsPiCC,
103-
104-
otfmulticharm::DCAToPVXi,
105-
otfmulticharm::DCAToPVXiC,
106-
otfmulticharm::DCAToPVXiCC,
107-
otfmulticharm::DCAToPVPiFromXi,
108-
otfmulticharm::DCAToPVPiFromLa,
109-
otfmulticharm::DCAToPVPrFromLa,
110-
otfmulticharm::DCAToPVPiC1,
111-
otfmulticharm::DCAToPVPiC2,
112-
otfmulticharm::DCAToPVPiCC);
118+
otfmulticharm::XiDCAxy,
119+
otfmulticharm::XicDCAxy,
120+
otfmulticharm::XiccDCAxy,
121+
otfmulticharm::XiDCAz,
122+
otfmulticharm::XicDCAz,
123+
otfmulticharm::XiccDCAz,
124+
125+
otfmulticharm::PiFromXiDCAxy,
126+
otfmulticharm::PiFromLaDCAxy,
127+
otfmulticharm::PrFromLaDCAxy,
128+
otfmulticharm::PiFromXiDCAz,
129+
otfmulticharm::PiFromLaDCAz,
130+
otfmulticharm::PrFromLaDCAz,
131+
132+
otfmulticharm::Pi1cDCAxy,
133+
otfmulticharm::Pi2cDCAxy,
134+
otfmulticharm::PiccDCAxy,
135+
otfmulticharm::Pi1cDCAz,
136+
otfmulticharm::Pi2cDCAz,
137+
otfmulticharm::PiccDCAz,
138+
139+
otfmulticharm::XicDecayRadius2D,
140+
otfmulticharm::XiccDecayRadius2D,
141+
otfmulticharm::XicProperLength,
142+
otfmulticharm::XicDistanceFromPV,
143+
otfmulticharm::XiccProperLength,
144+
145+
otfmulticharm::Pi1cTofDeltaInner,
146+
otfmulticharm::Pi1cTofNSigmaInner,
147+
otfmulticharm::Pi1cTofDeltaOuter,
148+
otfmulticharm::Pi1cTofNSigmaOuter,
149+
150+
otfmulticharm::Pi2cTofDeltaInner,
151+
otfmulticharm::Pi2cTofNSigmaInner,
152+
otfmulticharm::Pi2cTofDeltaOuter,
153+
otfmulticharm::Pi2cTofNSigmaOuter,
154+
155+
otfmulticharm::PiccTofDeltaInner,
156+
otfmulticharm::PiccTofNSigmaInner,
157+
otfmulticharm::PiccTofDeltaOuter,
158+
otfmulticharm::PiccTofNSigmaOuter,
159+
160+
otfmulticharm::BachPt,
161+
otfmulticharm::BachEta,
162+
163+
otfmulticharm::PosPt,
164+
otfmulticharm::PosEta,
165+
166+
otfmulticharm::NegPt,
167+
otfmulticharm::NegEta,
168+
169+
otfmulticharm::Pi1cPt,
170+
otfmulticharm::Pi1cEta,
171+
172+
otfmulticharm::Pi2cPt,
173+
otfmulticharm::Pi2cEta,
174+
175+
otfmulticharm::PiccPt,
176+
otfmulticharm::PiccEta);
113177

114178
} // namespace o2::aod
115179

‎ALICE3/TableProducer/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ o2physics_add_dpl_workflow(alice3-decayfinder
4141
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
4242
COMPONENT_NAME Analysis)
4343

44-
o2physics_add_dpl_workflow(alice3-multicharm
45-
SOURCES alice3-multicharm.cxx
44+
o2physics_add_dpl_workflow(alice3-multicharm-table
45+
SOURCES alice3-multicharmTable.cxx
4646
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
4747
COMPONENT_NAME Analysis)
4848

0 commit comments

Comments
 (0)