Skip to content

Commit 9ef0d13

Browse files
committed
adding shift correction
1 parent a9b0c50 commit 9ef0d13

3 files changed

Lines changed: 417 additions & 68 deletions

File tree

Common/DataModel/Qvectors.h

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
#ifndef COMMON_DATAMODEL_QVECTORS_H_
2222
#define COMMON_DATAMODEL_QVECTORS_H_
2323

24-
#include <Framework/AnalysisDataModel.h>
25-
2624
#include <vector>
25+
#include "Framework/AnalysisDataModel.h"
2726

2827
namespace o2::aod
2928
{
@@ -51,6 +50,24 @@ DECLARE_SOA_COLUMN(QvecTPCnegImVec, qvecTPCnegImVec, std::vector<float>);
5150
DECLARE_SOA_COLUMN(QvecTPCallReVec, qvecTPCallReVec, std::vector<float>);
5251
DECLARE_SOA_COLUMN(QvecTPCallImVec, qvecTPCallImVec, std::vector<float>);
5352

53+
DECLARE_SOA_COLUMN(QvecShiftedRe, qvecShiftedRe, std::vector<float>);
54+
DECLARE_SOA_COLUMN(QvecShiftedIm, qvecShiftedIm, std::vector<float>);
55+
56+
DECLARE_SOA_COLUMN(QvecShiftedFT0CReVec, qvecShiftedFT0CReVec, std::vector<float>);
57+
DECLARE_SOA_COLUMN(QvecShiftedFT0CImVec, qvecShiftedFT0CImVec, std::vector<float>);
58+
DECLARE_SOA_COLUMN(QvecShiftedFT0AReVec, qvecShiftedFT0AReVec, std::vector<float>);
59+
DECLARE_SOA_COLUMN(QvecShiftedFT0AImVec, qvecShiftedFT0AImVec, std::vector<float>);
60+
DECLARE_SOA_COLUMN(QvecShiftedFT0MReVec, qvecShiftedFT0MReVec, std::vector<float>);
61+
DECLARE_SOA_COLUMN(QvecShiftedFT0MImVec, qvecShiftedFT0MImVec, std::vector<float>);
62+
DECLARE_SOA_COLUMN(QvecShiftedFV0AReVec, qvecShiftedFV0AReVec, std::vector<float>);
63+
DECLARE_SOA_COLUMN(QvecShiftedFV0AImVec, qvecShiftedFV0AImVec, std::vector<float>);
64+
DECLARE_SOA_COLUMN(QvecShiftedTPCposReVec, qvecShiftedTPCposReVec, std::vector<float>);
65+
DECLARE_SOA_COLUMN(QvecShiftedTPCposImVec, qvecShiftedTPCposImVec, std::vector<float>);
66+
DECLARE_SOA_COLUMN(QvecShiftedTPCnegReVec, qvecShiftedTPCnegReVec, std::vector<float>);
67+
DECLARE_SOA_COLUMN(QvecShiftedTPCnegImVec, qvecShiftedTPCnegImVec, std::vector<float>);
68+
DECLARE_SOA_COLUMN(QvecShiftedTPCallReVec, qvecShiftedTPCallReVec, std::vector<float>);
69+
DECLARE_SOA_COLUMN(QvecShiftedTPCallImVec, qvecShiftedTPCallImVec, std::vector<float>);
70+
5471
DECLARE_SOA_COLUMN(QvecFT0CRe, qvecFT0CRe, float);
5572
DECLARE_SOA_COLUMN(QvecFT0CIm, qvecFT0CIm, float);
5673
DECLARE_SOA_COLUMN(QvecFT0ARe, qvecFT0ARe, float);
@@ -104,6 +121,9 @@ DECLARE_SOA_COLUMN(LabelsBTot, labelsBTot, std::vector<int>);
104121
DECLARE_SOA_TABLE(Qvectors, "AOD", "QVECTORDEVS", //! Table with all Qvectors.
105122
qvec::Cent, qvec::IsCalibrated, qvec::QvecRe, qvec::QvecIm, qvec::QvecAmp);
106123
using Qvector = Qvectors::iterator;
124+
DECLARE_SOA_TABLE(QvectorsShifteds, "AOD", "QVECTORSCDEVS", //! Table with all shifted Qvectors.
125+
qvec::Cent, qvec::IsCalibrated, qvec::QvecShiftedRe, qvec::QvecShiftedIm, qvec::QvecAmp);
126+
using QvectorShifted = QvectorsShifteds::iterator;
107127

108128
DECLARE_SOA_TABLE(QvectorFT0Cs, "AOD", "QVECTORSFT0C", qvec::IsCalibrated, qvec::QvecFT0CRe, qvec::QvecFT0CIm, qvec::SumAmplFT0C);
109129
DECLARE_SOA_TABLE(QvectorFT0As, "AOD", "QVECTORSFT0A", qvec::IsCalibrated, qvec::QvecFT0ARe, qvec::QvecFT0AIm, qvec::SumAmplFT0A);
@@ -121,6 +141,14 @@ DECLARE_SOA_TABLE(QvectorTPCposVecs, "AOD", "QVECTORSTPCPVEC", qvec::IsCalibrate
121141
DECLARE_SOA_TABLE(QvectorTPCnegVecs, "AOD", "QVECTORSTPCNVEC", qvec::IsCalibrated, qvec::QvecTPCnegReVec, qvec::QvecTPCnegImVec, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
122142
DECLARE_SOA_TABLE(QvectorTPCallVecs, "AOD", "QVECTORSTPCAVEC", qvec::IsCalibrated, qvec::QvecTPCallReVec, qvec::QvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
123143

144+
DECLARE_SOA_TABLE(QvectorShiftedFT0CVecs, "AOD", "QVECSHIFTEDFT0C", qvec::IsCalibrated, qvec::QvecShiftedFT0CReVec, qvec::QvecShiftedFT0CImVec, qvec::SumAmplFT0C);
145+
DECLARE_SOA_TABLE(QvectorShiftedFT0AVecs, "AOD", "QVECSHIFTEDFT0A", qvec::IsCalibrated, qvec::QvecShiftedFT0AReVec, qvec::QvecShiftedFT0AImVec, qvec::SumAmplFT0A);
146+
DECLARE_SOA_TABLE(QvectorShiftedFT0MVecs, "AOD", "QVECSHIFTEDFT0M", qvec::IsCalibrated, qvec::QvecShiftedFT0MReVec, qvec::QvecShiftedFT0MImVec, qvec::SumAmplFT0M);
147+
DECLARE_SOA_TABLE(QvectorShiftedFV0AVecs, "AOD", "QVECSHIFTEDFV0A", qvec::IsCalibrated, qvec::QvecShiftedFV0AReVec, qvec::QvecShiftedFV0AImVec, qvec::SumAmplFV0A);
148+
DECLARE_SOA_TABLE(QvectorShiftedTPCposVecs, "AOD", "QVECSHIFTEDTPCP", qvec::IsCalibrated, qvec::QvecShiftedTPCposReVec, qvec::QvecShiftedTPCposImVec, qvec::NTrkTPCpos, qvec::LabelsTPCpos);
149+
DECLARE_SOA_TABLE(QvectorShiftedTPCnegVecs, "AOD", "QVECSHIFTEDTPCN", qvec::IsCalibrated, qvec::QvecShiftedTPCnegReVec, qvec::QvecShiftedTPCnegImVec, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
150+
DECLARE_SOA_TABLE(QvectorShiftedTPCallVecs, "AOD", "QVECSHIFTEDTPCA", qvec::IsCalibrated, qvec::QvecShiftedTPCallReVec, qvec::QvecShiftedTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
151+
124152
using QvectorFT0C = QvectorFT0Cs::iterator;
125153
using QvectorFT0A = QvectorFT0As::iterator;
126154
using QvectorFT0M = QvectorFT0Ms::iterator;
@@ -137,6 +165,14 @@ using QvectorTPCposVec = QvectorTPCposVecs::iterator;
137165
using QvectorTPCnegVec = QvectorTPCnegVecs::iterator;
138166
using QvectorTPCallVec = QvectorTPCallVecs::iterator;
139167

168+
using QvectorShiftedFT0CVec = QvectorShiftedFT0CVecs::iterator;
169+
using QvectorShiftedFT0AVec = QvectorShiftedFT0AVecs::iterator;
170+
using QvectorShiftedFT0MVec = QvectorShiftedFT0MVecs::iterator;
171+
using QvectorShiftedFV0AVec = QvectorShiftedFV0AVecs::iterator;
172+
using QvectorShiftedTPCposVec = QvectorShiftedTPCposVecs::iterator;
173+
using QvectorShiftedTPCnegVec = QvectorShiftedTPCnegVecs::iterator;
174+
using QvectorShiftedTPCallVec = QvectorShiftedTPCallVecs::iterator;
175+
140176
// Deprecated, will be removed in future after transition time //
141177
DECLARE_SOA_TABLE(QvectorBPoss, "AOD", "QVECTORSBPOS", qvec::IsCalibrated, qvec::QvecBPosRe, qvec::QvecBPosIm, qvec::NTrkBPos, qvec::LabelsBPos);
142178
DECLARE_SOA_TABLE(QvectorBNegs, "AOD", "QVECTORSBNEG", qvec::IsCalibrated, qvec::QvecBNegRe, qvec::QvecBNegIm, qvec::NTrkBNeg, qvec::LabelsBNeg);

0 commit comments

Comments
 (0)