Skip to content

Commit 8f94641

Browse files
giovannimalfattoregiovannimalfattore
committed
NucleiTask - Fix variables
1 parent b6b28e3 commit 8f94641

2 files changed

Lines changed: 74 additions & 74 deletions

File tree

‎PWGLF/DataModel/LFNucleiTables.h‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -76,42 +76,42 @@ DECLARE_SOA_DYNAMIC_COLUMN(Rapidity, rapidity,
7676
// ITS
7777
DECLARE_SOA_COLUMN(ItsClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer
7878
// TPC
79-
DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float);
80-
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float);
81-
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float);
82-
DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float);
83-
DECLARE_SOA_COLUMN(TPCNSigmaTr, tpcNSigmaTr, float);
84-
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float);
85-
DECLARE_SOA_COLUMN(TPCNSigmaAl, tpcNSigmaAl, float);
79+
DECLARE_SOA_COLUMN(TpcNSigmaPi, tpcNSigmaPi, float);
80+
DECLARE_SOA_COLUMN(TpcNSigmaKa, tpcNSigmaKa, float);
81+
DECLARE_SOA_COLUMN(TpcNSigmaPr, tpcNSigmaPr, float);
82+
DECLARE_SOA_COLUMN(TpcNSigmaDe, tpcNSigmaDe, float);
83+
DECLARE_SOA_COLUMN(TpcNSigmaTr, tpcNSigmaTr, float);
84+
DECLARE_SOA_COLUMN(TpcNSigmaHe, tpcNSigmaHe, float);
85+
DECLARE_SOA_COLUMN(TpcNSigmaAl, tpcNSigmaAl, float);
8686
// TOF
87-
DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float);
88-
DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float);
89-
DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float);
90-
DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float);
91-
DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float);
92-
DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float);
93-
DECLARE_SOA_COLUMN(TOFNSigmaAl, tofNSigmaAl, float);
94-
DECLARE_SOA_COLUMN(TPCExpSignalDiffPr, tpcExpSignalDiffPr, float);
95-
DECLARE_SOA_COLUMN(TPCExpSignalDiffDe, tpcExpSignalDiffDe, float);
96-
DECLARE_SOA_COLUMN(TPCExpSignalDiffHe, tpcExpSignalDiffHe, float);
97-
DECLARE_SOA_COLUMN(TOFExpSignalDiffPr, tofExpSignalDiffPr, float);
98-
DECLARE_SOA_COLUMN(TOFExpSignalDiffDe, tofExpSignalDiffDe, float);
99-
DECLARE_SOA_COLUMN(TOFExpSignalDiffHe, tofExpSignalDiffHe, float);
87+
DECLARE_SOA_COLUMN(TofNSigmaPi, tofNSigmaPi, float);
88+
DECLARE_SOA_COLUMN(TofNSigmaKa, tofNSigmaKa, float);
89+
DECLARE_SOA_COLUMN(TofNSigmaPr, tofNSigmaPr, float);
90+
DECLARE_SOA_COLUMN(TofNSigmaDe, tofNSigmaDe, float);
91+
DECLARE_SOA_COLUMN(TofNSigmaTr, tofNSigmaTr, float);
92+
DECLARE_SOA_COLUMN(TofNSigmaHe, tofNSigmaHe, float);
93+
DECLARE_SOA_COLUMN(TofNSigmaAl, tofNSigmaAl, float);
94+
DECLARE_SOA_COLUMN(TpcExpSignalDiffPr, tpcExpSignalDiffPr, float);
95+
DECLARE_SOA_COLUMN(TpcExpSignalDiffDe, tpcExpSignalDiffDe, float);
96+
DECLARE_SOA_COLUMN(TpcExpSignalDiffHe, tpcExpSignalDiffHe, float);
97+
DECLARE_SOA_COLUMN(TofExpSignalDiffPr, tofExpSignalDiffPr, float);
98+
DECLARE_SOA_COLUMN(TofExpSignalDiffDe, tofExpSignalDiffDe, float);
99+
DECLARE_SOA_COLUMN(TofExpSignalDiffHe, tofExpSignalDiffHe, float);
100100
DECLARE_SOA_COLUMN(IsEvTimeTOF, isEvTimeTOF, bool);
101101
DECLARE_SOA_COLUMN(IsEvTimeT0AC, isEvTimeT0AC, bool);
102102
DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool);
103103
DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool);
104104
DECLARE_SOA_COLUMN(DcaXY, dcaXY, float);
105105
DECLARE_SOA_COLUMN(DcaZ, dcaZ, float);
106106
DECLARE_SOA_COLUMN(TpcInnerParam, tpcInnerParam, float);
107-
DECLARE_SOA_COLUMN(TOFExpMom, tofExpMom, float);
108-
DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float);
107+
DECLARE_SOA_COLUMN(TofExpMom, tofExpMom, float);
108+
DECLARE_SOA_COLUMN(TpcSignal, tpcSignal, float);
109109
DECLARE_SOA_COLUMN(Beta, beta, float);
110110
// TPC and ITS QA
111-
DECLARE_SOA_COLUMN(PIDForTracking, pidForTracking, uint8_t);
112-
DECLARE_SOA_COLUMN(ITSNCls, itsNCls, int16_t);
113-
DECLARE_SOA_COLUMN(TPCChi2Ncl, tpcChi2NCl, float);
114-
DECLARE_SOA_COLUMN(ITSChi2NCl, itsChi2NCl, float);
111+
DECLARE_SOA_COLUMN(PidForTracking, pidForTracking, uint8_t);
112+
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int16_t);
113+
DECLARE_SOA_COLUMN(TpcChi2Ncl, tpcChi2NCl, float);
114+
DECLARE_SOA_COLUMN(ItsChi2NCl, itsChi2NCl, float);
115115
DECLARE_SOA_COLUMN(TpcPassed, tpcPassed, bool);
116116
DECLARE_SOA_COLUMN(ItsPassed, itsPassed, bool);
117117
DECLARE_SOA_COLUMN(FakeHitsFlag, fakeHitsFlag, bool);
@@ -124,39 +124,39 @@ DECLARE_SOA_COLUMN(GetProcess, getProcess, int);
124124
} // namespace full
125125
namespace dummy
126126
{
127-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaPi, tpcNSigmaPi,
127+
DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaPi, tpcNSigmaPi,
128128
[](bool /*b*/) -> float { return 0.f; });
129-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaKa, tpcNSigmaKa,
129+
DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaKa, tpcNSigmaKa,
130130
[](bool /*b*/) -> float { return 0.f; });
131-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaPr, tpcNSigmaPr,
131+
DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaPr, tpcNSigmaPr,
132132
[](bool /*b*/) -> float { return 0.f; });
133-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaTr, tpcNSigmaTr,
133+
DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaTr, tpcNSigmaTr,
134134
[](bool /*b*/) -> float { return 0.f; });
135-
DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaAl, tpcNSigmaAl,
135+
DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaAl, tpcNSigmaAl,
136136
[](bool /*b*/) -> float { return 0.f; });
137-
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaPi, tofNSigmaPi,
137+
DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaPi, tofNSigmaPi,
138138
[](bool /*b*/) -> float { return 0.f; });
139-
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaKa, tofNSigmaKa,
139+
DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaKa, tofNSigmaKa,
140140
[](bool /*b*/) -> float { return 0.f; });
141-
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaPr, tofNSigmaPr,
141+
DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaPr, tofNSigmaPr,
142142
[](bool /*b*/) -> float { return 0.f; });
143-
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaTr, tofNSigmaTr,
143+
DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaTr, tofNSigmaTr,
144144
[](bool /*b*/) -> float { return 0.f; });
145-
DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaAl, tofNSigmaAl,
145+
DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaAl, tofNSigmaAl,
146146
[](bool /*b*/) -> float { return 0.f; });
147-
DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffPr, tpcExpSignalDiffPr,
147+
DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffPr, tpcExpSignalDiffPr,
148148
[](bool /*b*/) -> float { return 0.f; });
149-
DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffDe, tpcExpSignalDiffDe,
149+
DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffDe, tpcExpSignalDiffDe,
150150
[](bool /*b*/) -> float { return 0.f; });
151-
DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffHe, tpcExpSignalDiffHe,
151+
DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffHe, tpcExpSignalDiffHe,
152152
[](bool /*b*/) -> float { return 0.f; });
153-
DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffPr, tofExpSignalDiffPr,
153+
DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffPr, tofExpSignalDiffPr,
154154
[](bool /*b*/) -> float { return 0.f; });
155-
DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffDe, tofExpSignalDiffDe,
155+
DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffDe, tofExpSignalDiffDe,
156156
[](bool /*b*/) -> float { return 0.f; });
157-
DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffHe, tofExpSignalDiffHe,
157+
DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffHe, tofExpSignalDiffHe,
158158
[](bool /*b*/) -> float { return 0.f; });
159-
DECLARE_SOA_DYNAMIC_COLUMN(TOFExpMom, tofExpMom,
159+
DECLARE_SOA_DYNAMIC_COLUMN(TofExpMom, tofExpMom,
160160
[](bool /*b*/) -> float { return 0.f; });
161161
} // namespace dummy
162162

@@ -172,26 +172,26 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL",
172172
o2::soa::Index<>,
173173
full::LfNuclEventId,
174174
full::DcaXY, full::DcaZ,
175-
full::TPCNSigmaDe, full::TPCNSigmaHe,
176-
full::TOFNSigmaDe, full::TOFNSigmaHe,
175+
full::TpcNSigmaDe, full::TpcNSigmaHe,
176+
full::TofNSigmaDe, full::TofNSigmaHe,
177177
full::IsEvTimeTOF,
178178
full::IsEvTimeT0AC,
179179
full::HasTOF,
180180
full::HasTRD,
181181
full::TpcInnerParam,
182182
full::Beta,
183-
full::PIDForTracking,
184-
full::TPCSignal,
183+
full::PidForTracking,
184+
full::TpcSignal,
185185
full::Pt,
186186
full::Eta,
187187
full::Phi,
188188
full::Sign,
189-
full::ITSNCls,
189+
full::ItsNCls,
190190
track::TPCNClsFindable,
191191
track::TPCNClsFindableMinusFound,
192192
track::TPCNClsFindableMinusCrossedRows,
193-
full::TPCChi2Ncl,
194-
full::ITSChi2NCl,
193+
full::TpcChi2Ncl,
194+
full::ItsChi2NCl,
195195
track::ITSClusterMap,
196196
full::IsPVContributor,
197197
full::P<full::Pt, full::Eta>,
@@ -205,51 +205,51 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1,
205205
o2::soa::Index<>,
206206
full::LfNuclEventId,
207207
full::DcaXY, full::DcaZ,
208-
full::TPCNSigmaDe, full::TPCNSigmaHe,
209-
full::TOFNSigmaDe, full::TOFNSigmaHe,
208+
full::TpcNSigmaDe, full::TpcNSigmaHe,
209+
full::TofNSigmaDe, full::TofNSigmaHe,
210210
full::IsEvTimeTOF,
211211
full::IsEvTimeT0AC,
212212
full::HasTOF,
213213
full::HasTRD,
214214
full::TpcInnerParam,
215215
full::Beta,
216-
full::PIDForTracking,
217-
full::TPCSignal,
216+
full::PidForTracking,
217+
full::TpcSignal,
218218
full::Pt,
219219
full::Eta,
220220
full::Phi,
221221
full::Sign,
222-
full::ITSNCls,
222+
full::ItsNCls,
223223
track::TPCNClsFindable,
224224
track::TPCNClsFindableMinusFound,
225225
track::TPCNClsFindableMinusCrossedRows,
226-
full::TPCChi2Ncl,
227-
full::ITSChi2NCl,
226+
full::TpcChi2Ncl,
227+
full::ItsChi2NCl,
228228
track::ITSClusterMap,
229229
full::IsPVContributor,
230230
full::P<full::Pt, full::Eta>,
231231
full::ItsClusterSizes,
232-
dummy::TPCNSigmaPi<full::HasTOF>, dummy::TPCNSigmaKa<full::HasTOF>, dummy::TPCNSigmaPr<full::HasTOF>,
233-
dummy::TPCNSigmaTr<full::HasTOF>, dummy::TPCNSigmaAl<full::HasTOF>,
234-
dummy::TOFNSigmaPi<full::HasTOF>, dummy::TOFNSigmaKa<full::HasTOF>, dummy::TOFNSigmaPr<full::HasTOF>,
235-
dummy::TOFNSigmaTr<full::HasTOF>, dummy::TOFNSigmaAl<full::HasTOF>,
236-
dummy::TPCExpSignalDiffPr<full::HasTOF>, dummy::TPCExpSignalDiffDe<full::HasTOF>, dummy::TPCExpSignalDiffHe<full::HasTOF>,
237-
dummy::TOFExpSignalDiffPr<full::HasTOF>, dummy::TOFExpSignalDiffDe<full::HasTOF>, dummy::TOFExpSignalDiffHe<full::HasTOF>,
238-
dummy::TOFExpMom<full::HasTOF>,
232+
dummy::TpcNSigmaPi<full::HasTOF>, dummy::TpcNSigmaKa<full::HasTOF>, dummy::TpcNSigmaPr<full::HasTOF>,
233+
dummy::TpcNSigmaTr<full::HasTOF>, dummy::TpcNSigmaAl<full::HasTOF>,
234+
dummy::TofNSigmaPi<full::HasTOF>, dummy::TofNSigmaKa<full::HasTOF>, dummy::TofNSigmaPr<full::HasTOF>,
235+
dummy::TofNSigmaTr<full::HasTOF>, dummy::TofNSigmaAl<full::HasTOF>,
236+
dummy::TpcExpSignalDiffPr<full::HasTOF>, dummy::TpcExpSignalDiffDe<full::HasTOF>, dummy::TpcExpSignalDiffHe<full::HasTOF>,
237+
dummy::TofExpSignalDiffPr<full::HasTOF>, dummy::TofExpSignalDiffDe<full::HasTOF>, dummy::TofExpSignalDiffHe<full::HasTOF>,
238+
dummy::TofExpMom<full::HasTOF>,
239239
full::Rapidity<full::Pt, full::Eta>,
240240
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
241241
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
242242
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
243243
track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>);
244244

245245
DECLARE_SOA_TABLE(LfCandNucleusExtra, "AOD", "LFNUCLEXTRA",
246-
full::TPCNSigmaPi, full::TPCNSigmaKa, full::TPCNSigmaPr,
247-
full::TPCNSigmaTr, full::TPCNSigmaAl,
248-
full::TOFNSigmaPi, full::TOFNSigmaKa, full::TOFNSigmaPr,
249-
full::TOFNSigmaTr, full::TOFNSigmaAl,
250-
full::TPCExpSignalDiffPr, full::TPCExpSignalDiffDe, full::TPCExpSignalDiffHe,
251-
full::TOFExpSignalDiffPr, full::TOFExpSignalDiffDe, full::TOFExpSignalDiffHe,
252-
full::TOFExpMom);
246+
full::TpcNSigmaPi, full::TpcNSigmaKa, full::TpcNSigmaPr,
247+
full::TpcNSigmaTr, full::TpcNSigmaAl,
248+
full::TofNSigmaPi, full::TofNSigmaKa, full::TofNSigmaPr,
249+
full::TofNSigmaTr, full::TofNSigmaAl,
250+
full::TpcExpSignalDiffPr, full::TpcExpSignalDiffDe, full::TpcExpSignalDiffHe,
251+
full::TofExpSignalDiffPr, full::TofExpSignalDiffDe, full::TofExpSignalDiffHe,
252+
full::TofExpMom);
253253

254254
DECLARE_SOA_TABLE(LfCandNucleusMC, "AOD", "LFNUCLMC",
255255
mcparticle::PdgCode,

‎PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct LfTreeCreatorNuclei {
9494
Configurable<float> cfgHighCutVertex{"cfgHighCutVertex", 10.0f, "Accepted z-vertex range"};
9595
Configurable<float> cfgLowCutVertex{"cfgLowCutVertex", -10.0f, "Accepted z-vertex range"};
9696
Configurable<bool> useSel8{"useSel8", true, "Use Sel8 for run3 Event Selection"};
97-
Configurable<bool> tvxTrigger{"tvxTrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
97+
Configurable<bool> Tttrigger{"Tttrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
9898
Configurable<bool> removeTFBorder{"removeTFBorder", false, "Remove TimeFrame border (default w/ Sel8)"};
9999
Configurable<bool> removeITSROFBorder{"removeITSROFBorder", false, "Remove ITS Read-Out Frame border (default w/ Sel8)"};
100100

@@ -313,7 +313,7 @@ struct LfTreeCreatorNuclei {
313313
hEvents.fill(HIST("eventSelection"), 0);
314314

315315
if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
316-
if (tvxTrigger)
316+
if (Tttrigger)
317317
continue;
318318
} else {
319319
hEvents.fill(HIST("eventSelection"), 1);
@@ -371,7 +371,7 @@ struct LfTreeCreatorNuclei {
371371
hEvents.fill(HIST("eventSelection"), 0);
372372

373373
if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
374-
if (tvxTrigger)
374+
if (Tttrigger)
375375
continue;
376376
} else {
377377
hEvents.fill(HIST("eventSelection"), 1);

0 commit comments

Comments
 (0)