Skip to content

Commit c42d6c3

Browse files
author
Marcello Di Costanzo
committed
Independent calibrations for EsE q-vectors
1 parent 2c61a23 commit c42d6c3

4 files changed

Lines changed: 518 additions & 317 deletions

File tree

‎Common/DataModel/Qvectors.h‎

Lines changed: 89 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ DECLARE_SOA_COLUMN(LabelsTPCpos, labelsTPCpos, std::vector<int>);
7777
DECLARE_SOA_COLUMN(LabelsTPCneg, labelsTPCneg, std::vector<int>);
7878
DECLARE_SOA_COLUMN(LabelsTPCall, labelsTPCall, std::vector<int>);
7979

80-
// Normalized amplitudes for Event-shape Engineering
81-
DECLARE_SOA_COLUMN(QVecRedFT0C, qVecRedFT0C, float);
82-
DECLARE_SOA_COLUMN(QVecRedTpcPos, qVecRedTpcPos, float);
83-
DECLARE_SOA_COLUMN(QVecRedTpcNeg, qVecRedTpcNeg, float);
84-
DECLARE_SOA_COLUMN(QVecRedTpcAll, qVecRedTpcAll, float);
85-
8680
// Deprecated, will be removed in future after transition time //
8781
DECLARE_SOA_COLUMN(QvecBPosReVec, qvecBPosReVec, std::vector<float>);
8882
DECLARE_SOA_COLUMN(QvecBPosImVec, qvecBPosImVec, std::vector<float>);
@@ -127,8 +121,6 @@ DECLARE_SOA_TABLE(QvectorTPCposVecs, "AOD", "QVECTORSTPCPVEC", qvec::IsCalibrate
127121
DECLARE_SOA_TABLE(QvectorTPCnegVecs, "AOD", "QVECTORSTPCNVEC", qvec::IsCalibrated, qvec::QvecTPCnegReVec, qvec::QvecTPCnegImVec, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
128122
DECLARE_SOA_TABLE(QvectorTPCallVecs, "AOD", "QVECTORSTPCAVEC", qvec::IsCalibrated, qvec::QvecTPCallReVec, qvec::QvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
129123

130-
DECLARE_SOA_TABLE(QvectorsReds, "AOD", "QVECTORSRED", qvec::QVecRedFT0C, qvec::QVecRedTpcPos, qvec::QVecRedTpcNeg, qvec::QVecRedTpcAll);
131-
132124
using QvectorFT0C = QvectorFT0Cs::iterator;
133125
using QvectorFT0A = QvectorFT0As::iterator;
134126
using QvectorFT0M = QvectorFT0Ms::iterator;
@@ -145,8 +137,6 @@ using QvectorTPCposVec = QvectorTPCposVecs::iterator;
145137
using QvectorTPCnegVec = QvectorTPCnegVecs::iterator;
146138
using QvectorTPCallVec = QvectorTPCallVecs::iterator;
147139

148-
using QvectorRed = QvectorsReds::iterator;
149-
150140
// Deprecated, will be removed in future after transition time //
151141
DECLARE_SOA_TABLE(QvectorBPoss, "AOD", "QVECTORSBPOS", qvec::IsCalibrated, qvec::QvecBPosRe, qvec::QvecBPosIm, qvec::NTrkBPos, qvec::LabelsBPos);
152142
DECLARE_SOA_TABLE(QvectorBNegs, "AOD", "QVECTORSBNEG", qvec::IsCalibrated, qvec::QvecBNegRe, qvec::QvecBNegIm, qvec::NTrkBNeg, qvec::LabelsBNeg);
@@ -165,6 +155,95 @@ using QvectorBNegVec = QvectorBNegVecs::iterator;
165155
using QvectorBTotVec = QvectorBTotVecs::iterator;
166156
/////////////////////////////////////////////////////////////////
167157

158+
namespace ese_qvec
159+
{
160+
DECLARE_SOA_COLUMN(IsCalibrated, isCalibrated, bool);
161+
162+
DECLARE_SOA_COLUMN(EseQvecRe, eseQvecRe, std::vector<float>);
163+
DECLARE_SOA_COLUMN(EseQvecIm, eseQvecIm, std::vector<float>);
164+
DECLARE_SOA_COLUMN(EseQvecAmp, eseQvecAmp, std::vector<float>);
165+
166+
DECLARE_SOA_COLUMN(EseQvecFT0CReVec, eseQvecFT0CReVec, std::vector<float>);
167+
DECLARE_SOA_COLUMN(EseQvecFT0CImVec, eseQvecFT0CImVec, std::vector<float>);
168+
DECLARE_SOA_COLUMN(EseQvecFT0AReVec, eseQvecFT0AReVec, std::vector<float>);
169+
DECLARE_SOA_COLUMN(EseQvecFT0AImVec, eseQvecFT0AImVec, std::vector<float>);
170+
DECLARE_SOA_COLUMN(EseQvecFT0MReVec, eseQvecFT0MReVec, std::vector<float>);
171+
DECLARE_SOA_COLUMN(EseQvecFT0MImVec, eseQvecFT0MImVec, std::vector<float>);
172+
DECLARE_SOA_COLUMN(EseQvecFV0AReVec, eseQvecFV0AReVec, std::vector<float>);
173+
DECLARE_SOA_COLUMN(EseQvecFV0AImVec, eseQvecFV0AImVec, std::vector<float>);
174+
DECLARE_SOA_COLUMN(EseQvecTPCposReVec, eseQvecTPCposReVec, std::vector<float>);
175+
DECLARE_SOA_COLUMN(EseQvecTPCposImVec, eseQvecTPCposImVec, std::vector<float>);
176+
DECLARE_SOA_COLUMN(EseQvecTPCnegReVec, eseQvecTPCnegReVec, std::vector<float>);
177+
DECLARE_SOA_COLUMN(EseQvecTPCnegImVec, eseQvecTPCnegImVec, std::vector<float>);
178+
DECLARE_SOA_COLUMN(EseQvecTPCallReVec, eseQvecTPCallReVec, std::vector<float>);
179+
DECLARE_SOA_COLUMN(EseQvecTPCallImVec, eseQvecTPCallImVec, std::vector<float>);
180+
181+
DECLARE_SOA_COLUMN(EseQvecFT0CRe, eseQvecFT0CRe, float);
182+
DECLARE_SOA_COLUMN(EseQvecFT0CIm, eseQvecFT0CIm, float);
183+
DECLARE_SOA_COLUMN(EseQvecFT0ARe, eseQvecFT0ARe, float);
184+
DECLARE_SOA_COLUMN(EseQvecFT0AIm, eseQvecFT0AIm, float);
185+
DECLARE_SOA_COLUMN(EseQvecFT0MRe, eseQvecFT0MRe, float);
186+
DECLARE_SOA_COLUMN(EseQvecFT0MIm, eseQvecFT0MIm, float);
187+
DECLARE_SOA_COLUMN(EseQvecFV0ARe, eseQvecFV0ARe, float);
188+
DECLARE_SOA_COLUMN(EseQvecFV0AIm, eseQvecFV0AIm, float);
189+
DECLARE_SOA_COLUMN(EseQvecTPCposRe, eseQvecTPCposRe, float);
190+
DECLARE_SOA_COLUMN(EseQvecTPCposIm, eseQvecTPCposIm, float);
191+
DECLARE_SOA_COLUMN(EseQvecTPCnegRe, eseQvecTPCnegRe, float);
192+
DECLARE_SOA_COLUMN(EseQvecTPCnegIm, eseQvecTPCnegIm, float);
193+
DECLARE_SOA_COLUMN(EseQvecTPCallRe, eseQvecTPCallRe, float);
194+
DECLARE_SOA_COLUMN(EseQvecTPCallIm, eseQvecTPCallIm, float);
195+
196+
DECLARE_SOA_COLUMN(EseRedQFT0C, eseRedQFT0C, float);
197+
DECLARE_SOA_COLUMN(EseRedQFT0A, eseRedQFT0A, float);
198+
DECLARE_SOA_COLUMN(EseRedQFT0M, eseRedQFT0M, float);
199+
DECLARE_SOA_COLUMN(EseRedQFV0A, eseRedQFV0A, float);
200+
/////////////////////////////////////////////////////////////////
201+
} // namespace ese_qvec
202+
203+
DECLARE_SOA_TABLE(EseQvectors, "AOD", "ESEQVECTORDEVS", //! Table with all Qvectors.
204+
qvec::Cent, ese_qvec::IsCalibrated, ese_qvec::EseQvecRe, ese_qvec::EseQvecIm, ese_qvec::EseQvecAmp);
205+
using Qvector = Qvectors::iterator;
206+
207+
DECLARE_SOA_TABLE(EseQvecFT0Cs, "AOD", "ESEQVECFT0C", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0CRe, ese_qvec::EseQvecFT0CIm, qvec::SumAmplFT0C);
208+
DECLARE_SOA_TABLE(EseQvecFT0As, "AOD", "ESEQVECFT0A", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0ARe, ese_qvec::EseQvecFT0AIm, qvec::SumAmplFT0A);
209+
DECLARE_SOA_TABLE(EseQvecFT0Ms, "AOD", "ESEQVECFT0M", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0MRe, ese_qvec::EseQvecFT0MIm, qvec::SumAmplFT0M);
210+
DECLARE_SOA_TABLE(EseQvecFV0As, "AOD", "ESEQVECFV0A", ese_qvec::IsCalibrated, ese_qvec::EseQvecFV0ARe, ese_qvec::EseQvecFV0AIm, qvec::SumAmplFV0A);
211+
DECLARE_SOA_TABLE(EseQvecTPCposs, "AOD", "ESEQVECTPCPOS", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCposRe, ese_qvec::EseQvecTPCposIm, qvec::NTrkTPCpos, qvec::LabelsTPCpos);
212+
DECLARE_SOA_TABLE(EseQvecTPCnegs, "AOD", "ESEQVECTPCNEG", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCnegRe, ese_qvec::EseQvecTPCnegIm, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
213+
DECLARE_SOA_TABLE(EseQvecTPCalls, "AOD", "ESEQVECTPCALL", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCallRe, ese_qvec::EseQvecTPCallIm, qvec::NTrkTPCall, qvec::LabelsTPCall);
214+
215+
DECLARE_SOA_TABLE(EseQvecFT0CVecs, "AOD", "ESEQVECFT0CVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0CReVec, ese_qvec::EseQvecFT0CImVec, qvec::SumAmplFT0C);
216+
DECLARE_SOA_TABLE(EseQvecFT0AVecs, "AOD", "ESEQVECFT0AVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0AReVec, ese_qvec::EseQvecFT0AImVec, qvec::SumAmplFT0A);
217+
DECLARE_SOA_TABLE(EseQvecFT0MVecs, "AOD", "ESEQVECFT0MVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecFT0MReVec, ese_qvec::EseQvecFT0MImVec, qvec::SumAmplFT0M);
218+
DECLARE_SOA_TABLE(EseQvecFV0AVecs, "AOD", "ESEQVECFV0AVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecFV0AReVec, ese_qvec::EseQvecFV0AImVec, qvec::SumAmplFV0A);
219+
DECLARE_SOA_TABLE(EseQvecTPCposVecs, "AOD", "ESEQVECTPCPVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCposReVec, ese_qvec::EseQvecTPCposImVec, qvec::NTrkTPCpos, qvec::LabelsTPCpos);
220+
DECLARE_SOA_TABLE(EseQvecTPCnegVecs, "AOD", "ESEQVECTPCNVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCnegReVec, ese_qvec::EseQvecTPCnegImVec, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
221+
DECLARE_SOA_TABLE(EseQvecTPCallVecs, "AOD", "ESEQVECTPCAVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCallReVec, ese_qvec::EseQvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
222+
223+
DECLARE_SOA_TABLE(EseQvecPercs, "AOD", "ESEQVECPERC", ese_qvec::EseQvecFT0CRe, ese_qvec::EseQvecFT0CIm, qvec::SumAmplFT0C,
224+
ese_qvec::EseQvecFT0ARe, ese_qvec::EseQvecFT0AIm, qvec::SumAmplFT0A,
225+
ese_qvec::EseQvecFT0MRe, ese_qvec::EseQvecFT0MIm, qvec::SumAmplFT0M,
226+
ese_qvec::EseQvecFV0ARe, ese_qvec::EseQvecFV0AIm, qvec::SumAmplFV0A,
227+
ese_qvec::EseQvecTPCposRe, ese_qvec::EseQvecTPCposIm, qvec::NTrkTPCpos,
228+
ese_qvec::EseQvecTPCnegRe, ese_qvec::EseQvecTPCnegIm, qvec::NTrkTPCneg,
229+
ese_qvec::EseQvecTPCallRe, ese_qvec::EseQvecTPCallIm, qvec::NTrkTPCall);
230+
231+
using EseQvectorFT0C = EseQvecFT0Cs::iterator;
232+
using EseQvectorFT0A = EseQvecFT0As::iterator;
233+
using EseQvectorFT0M = EseQvecFT0Ms::iterator;
234+
using EseQvectorFV0A = EseQvecFV0As::iterator;
235+
using EseQvectorTPCpos = EseQvecTPCposs::iterator;
236+
using EseQvectorTPCneg = EseQvecTPCnegs::iterator;
237+
using EseQvectorTPCall = EseQvecTPCalls::iterator;
238+
239+
using EseQvectorFT0CVec = EseQvecFT0CVecs::iterator;
240+
using EseQvectorFT0AVec = EseQvecFT0AVecs::iterator;
241+
using EseQvectorFT0MVec = EseQvecFT0MVecs::iterator;
242+
using EseQvectorFV0AVec = EseQvecFV0AVecs::iterator;
243+
using EseQvectorTPCposVec = EseQvecTPCposVecs::iterator;
244+
using EseQvectorTPCnegVec = EseQvecTPCnegVecs::iterator;
245+
using EseQvectorTPCallVec = EseQvecTPCallVecs::iterator;
246+
/////////////////////////////////////////////////////////////////
168247
} // namespace o2::aod
169248

170249
#endif // COMMON_DATAMODEL_QVECTORS_H_

0 commit comments

Comments
 (0)