Skip to content

Commit 52940ab

Browse files
jikim1290jikim1290
committed
deleting dulplicated qvector tables
1 parent 91841f6 commit 52940ab

File tree

3 files changed

+31
-162
lines changed

3 files changed

+31
-162
lines changed

‎Common/DataModel/Qvectors.h‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,6 @@ DECLARE_SOA_COLUMN(QvecTPCnegImVec, qvecTPCnegImVec, std::vector<float>);
5151
DECLARE_SOA_COLUMN(QvecTPCallReVec, qvecTPCallReVec, std::vector<float>);
5252
DECLARE_SOA_COLUMN(QvecTPCallImVec, qvecTPCallImVec, std::vector<float>);
5353

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

129108
DECLARE_SOA_TABLE(QvectorFT0Cs, "AOD", "QVECTORSFT0C", qvec::IsCalibrated, qvec::QvecFT0CRe, qvec::QvecFT0CIm, qvec::SumAmplFT0C);
130109
DECLARE_SOA_TABLE(QvectorFT0As, "AOD", "QVECTORSFT0A", qvec::IsCalibrated, qvec::QvecFT0ARe, qvec::QvecFT0AIm, qvec::SumAmplFT0A);
@@ -142,14 +121,6 @@ DECLARE_SOA_TABLE(QvectorTPCposVecs, "AOD", "QVECTORSTPCPVEC", qvec::IsCalibrate
142121
DECLARE_SOA_TABLE(QvectorTPCnegVecs, "AOD", "QVECTORSTPCNVEC", qvec::IsCalibrated, qvec::QvecTPCnegReVec, qvec::QvecTPCnegImVec, qvec::NTrkTPCneg, qvec::LabelsTPCneg);
143122
DECLARE_SOA_TABLE(QvectorTPCallVecs, "AOD", "QVECTORSTPCAVEC", qvec::IsCalibrated, qvec::QvecTPCallReVec, qvec::QvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
144123

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

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

‎Common/TableProducer/qVectorsTable.cxx‎

Lines changed: 31 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@ struct qVectorsTable {
129129
Produces<aod::QvectorTPCnegVecs> qVectorTPCnegVec;
130130
Produces<aod::QvectorTPCallVecs> qVectorTPCallVec;
131131

132-
Produces<aod::QvectorsShifteds> qVectorShifted;
133-
Produces<aod::QvectorShiftedFT0CVecs> qVectorFT0CShiftedVec;
134-
Produces<aod::QvectorShiftedFT0AVecs> qVectorFT0AShiftedVec;
135-
Produces<aod::QvectorShiftedFT0MVecs> qVectorFT0MShiftedVec;
136-
Produces<aod::QvectorShiftedFV0AVecs> qVectorFV0AShiftedVec;
137-
Produces<aod::QvectorShiftedTPCposVecs> qVectorTPCposShiftedVec;
138-
Produces<aod::QvectorShiftedTPCnegVecs> qVectorTPCnegShiftedVec;
139-
Produces<aod::QvectorShiftedTPCallVecs> qVectorTPCallShiftedVec;
140-
141132
std::vector<float> FT0RelGainConst{};
142133
std::vector<float> FV0RelGainConst{};
143134

@@ -184,25 +175,15 @@ struct qVectorsTable {
184175
{"QvectorFV0As", cfgUseFV0A},
185176
{"QvectorFT0Ms", cfgUseFT0M},
186177
{"QvectorFT0As", cfgUseFT0A},
187-
{"QvectorFT0Cs", cfgUseFT0C},
188-
{"QvectorShiftedBTots", cfgUseBTot},
189-
{"QvectorShiftedBNegs", cfgUseBNeg},
190-
{"QvectorShiftedBPoss", cfgUseBPos},
191-
{"QvectorShiftedTPCalls", cfgUseTPCall},
192-
{"QvectorShiftedTPCnegs", cfgUseTPCneg},
193-
{"QvectorShiftedTPCposs", cfgUseTPCpos},
194-
{"QvectorShiftedFV0As", cfgUseFV0A},
195-
{"QvectorShiftedFT0Ms", cfgUseFT0M},
196-
{"QvectorShiftedFT0As", cfgUseFT0A},
197-
{"QvectorShiftedFT0Cs", cfgUseFT0C}};
178+
{"QvectorFT0Cs", cfgUseFT0C}};
198179

199180
void init(InitContext& initContext)
200181
{
201182
// Check the sub-detector used
202183
const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
203184
for (DeviceSpec const& device : workflows.devices) {
204185
for (auto const& input : device.inputs) {
205-
if (input.matcher.binding == "Qvectors" || input.matcher.binding == "QvectorsShifteds") {
186+
if (input.matcher.binding == "Qvectors") {
206187
for (auto const& det : useDetector) {
207188
useDetector[det.first.data()] = true;
208189
}
@@ -596,25 +577,6 @@ struct qVectorsTable {
596577
std::vector<float> qvecReTPCall{};
597578
std::vector<float> qvecImTPCall{};
598579

599-
std::vector<float> qvecShiftedRe{};
600-
std::vector<float> qvecShiftedIm{};
601-
std::vector<float> qvecShiftedAmp{};
602-
603-
std::vector<float> qvecReShiftedFT0C{};
604-
std::vector<float> qvecImShiftedFT0C{};
605-
std::vector<float> qvecReShiftedFT0A{};
606-
std::vector<float> qvecImShiftedFT0A{};
607-
std::vector<float> qvecReShiftedFT0M{};
608-
std::vector<float> qvecImShiftedFT0M{};
609-
std::vector<float> qvecReShiftedFV0A{};
610-
std::vector<float> qvecImShiftedFV0A{};
611-
std::vector<float> qvecReShiftedTPCpos{};
612-
std::vector<float> qvecImShiftedTPCpos{};
613-
std::vector<float> qvecReShiftedTPCneg{};
614-
std::vector<float> qvecImShiftedTPCneg{};
615-
std::vector<float> qvecReShiftedTPCall{};
616-
std::vector<float> qvecImShiftedTPCall{};
617-
618580
auto bc = coll.bc_as<aod::BCsWithTimestamps>();
619581
int currentRun = bc.runNumber();
620582
if (runNumber != currentRun) {
@@ -701,36 +663,35 @@ struct qVectorsTable {
701663
deltapsiTPCneg *= static_cast<float>(nmode);
702664
deltapsiTPCall *= static_cast<float>(nmode);
703665

704-
qvecReShiftedFT0C.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C) - qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C));
705-
qvecImShiftedFT0C.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C) + qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C));
706-
qvecReShiftedFT0A.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Cos(deltapsiFT0A) - qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Sin(deltapsiFT0A));
707-
qvecImShiftedFT0A.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Sin(deltapsiFT0A) + qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Cos(deltapsiFT0A));
708-
qvecReShiftedFT0M.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Cos(deltapsiFT0M) - qvecIm[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Sin(deltapsiFT0M));
709-
qvecImShiftedFT0M.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Sin(deltapsiFT0M) + qvecIm[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Cos(deltapsiFT0M));
710-
qvecReShiftedFV0A.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Cos(deltapsiFV0A) - qvecIm[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Sin(deltapsiFV0A));
711-
qvecImShiftedFV0A.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Sin(deltapsiFV0A) + qvecIm[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Cos(deltapsiFV0A));
712-
qvecReShiftedTPCpos.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Cos(deltapsiTPCpos) - qvecIm[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Sin(deltapsiTPCpos));
713-
qvecImShiftedTPCpos.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Sin(deltapsiTPCpos) + qvecIm[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Cos(deltapsiTPCpos));
714-
qvecReShiftedTPCneg.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Cos(deltapsiTPCneg) - qvecIm[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Sin(deltapsiTPCneg));
715-
qvecImShiftedTPCneg.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Sin(deltapsiTPCneg) + qvecIm[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Cos(deltapsiTPCneg));
716-
qvecReShiftedTPCall.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Cos(deltapsiTPCall) - qvecIm[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Sin(deltapsiTPCall));
717-
qvecImShiftedTPCall.push_back(qvecRe[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Sin(deltapsiTPCall) + qvecIm[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Cos(deltapsiTPCall));
718-
719-
qvecShiftedRe.push_back(qvecReShiftedFT0C[id]);
720-
qvecShiftedRe.push_back(qvecReShiftedFT0A[id]);
721-
qvecShiftedRe.push_back(qvecReShiftedFT0M[id]);
722-
qvecShiftedRe.push_back(qvecReShiftedFV0A[id]);
723-
qvecShiftedRe.push_back(qvecReShiftedTPCpos[id]);
724-
qvecShiftedRe.push_back(qvecReShiftedTPCneg[id]);
725-
qvecShiftedRe.push_back(qvecReShiftedTPCall[id]);
726-
727-
qvecShiftedIm.push_back(qvecImShiftedFT0C[id]);
728-
qvecShiftedIm.push_back(qvecImShiftedFT0A[id]);
729-
qvecShiftedIm.push_back(qvecImShiftedFT0M[id]);
730-
qvecShiftedIm.push_back(qvecImShiftedFV0A[id]);
731-
qvecShiftedIm.push_back(qvecImShiftedTPCpos[id]);
732-
qvecShiftedIm.push_back(qvecImShiftedTPCneg[id]);
733-
qvecShiftedIm.push_back(qvecImShiftedTPCall[id]);
666+
float qvecReShiftedFT0C = qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C) - qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C);
667+
float qvecImShiftedFT0C = qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C) + qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C);
668+
float qvecReShiftedFT0A = qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Cos(deltapsiFT0A) - qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Sin(deltapsiFT0A);
669+
float qvecImShiftedFT0A = qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Sin(deltapsiFT0A) + qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Cos(deltapsiFT0A);
670+
float qvecReShiftedFT0M = qvecRe[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Cos(deltapsiFT0M) - qvecIm[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Sin(deltapsiFT0M);
671+
float qvecImShiftedFT0M = qvecRe[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Sin(deltapsiFT0M) + qvecIm[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] * TMath::Cos(deltapsiFT0M);
672+
float qvecReShiftedFV0A = qvecRe[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Cos(deltapsiFV0A) - qvecIm[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Sin(deltapsiFV0A);
673+
float qvecImShiftedFV0A = qvecRe[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Sin(deltapsiFV0A) + qvecIm[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] * TMath::Cos(deltapsiFV0A);
674+
float qvecReShiftedTPCpos = qvecRe[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Cos(deltapsiTPCpos) - qvecIm[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Sin(deltapsiTPCpos);
675+
float qvecImShiftedTPCpos = qvecRe[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Sin(deltapsiTPCpos) + qvecIm[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] * TMath::Cos(deltapsiTPCpos);
676+
float qvecReShiftedTPCneg = qvecRe[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Cos(deltapsiTPCneg) - qvecIm[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Sin(deltapsiTPCneg);
677+
float qvecImShiftedTPCneg = qvecRe[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Sin(deltapsiTPCneg) + qvecIm[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] * TMath::Cos(deltapsiTPCneg);
678+
float qvecReShiftedTPCall = qvecRe[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Cos(deltapsiTPCall) - qvecIm[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Sin(deltapsiTPCall);
679+
float qvecImShiftedTPCall = qvecRe[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Sin(deltapsiTPCall) + qvecIm[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] * TMath::Cos(deltapsiTPCall);
680+
681+
qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] = qvecReShiftedFT0C;
682+
qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] = qvecImShiftedFT0C;
683+
qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] = qvecReShiftedFT0A;
684+
qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] = qvecImShiftedFT0A;
685+
qvecRe[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] = qvecReShiftedFT0M;
686+
qvecIm[(kTPCall + 1) * 4 * id + kFT0M * 4 + 3] = qvecImShiftedFT0M;
687+
qvecRe[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] = qvecReShiftedFV0A;
688+
qvecIm[(kTPCall + 1) * 4 * id + kFV0A * 4 + 3] = qvecImShiftedFV0A;
689+
qvecRe[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] = qvecReShiftedTPCpos;
690+
qvecIm[(kTPCall + 1) * 4 * id + kTPCpos * 4 + 3] = qvecImShiftedTPCpos;
691+
qvecRe[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] = qvecReShiftedTPCneg;
692+
qvecIm[(kTPCall + 1) * 4 * id + kTPCneg * 4 + 3] = qvecImShiftedTPCneg;
693+
qvecRe[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] = qvecReShiftedTPCall;
694+
qvecIm[(kTPCall + 1) * 4 * id + kTPCall * 4 + 3] = qvecImShiftedTPCall;
734695
}
735696
}
736697
int CorrLevel = cfgCorrLevel == 0 ? 0 : cfgCorrLevel - 1;
@@ -775,17 +736,6 @@ struct qVectorsTable {
775736
qVectorTPCnegVec(IsCalibrated, qvecReTPCneg, qvecImTPCneg, qvecAmp[kTPCneg], TrkTPCnegLabel);
776737
qVectorTPCallVec(IsCalibrated, qvecReTPCall, qvecImTPCall, qvecAmp[kTPCall], TrkTPCallLabel);
777738

778-
if (cfgShiftCorr) {
779-
qVectorShifted(cent, IsCalibrated, qvecShiftedRe, qvecShiftedIm, qvecAmp);
780-
qVectorFT0CShiftedVec(IsCalibrated, qvecReShiftedFT0C, qvecImShiftedFT0C, qvecAmp[kFT0C]);
781-
qVectorFT0AShiftedVec(IsCalibrated, qvecReShiftedFT0A, qvecImShiftedFT0A, qvecAmp[kFT0A]);
782-
qVectorFT0MShiftedVec(IsCalibrated, qvecReShiftedFT0M, qvecImShiftedFT0M, qvecAmp[kFT0M]);
783-
qVectorFV0AShiftedVec(IsCalibrated, qvecReShiftedFV0A, qvecImShiftedFV0A, qvecAmp[kFV0A]);
784-
qVectorTPCposShiftedVec(IsCalibrated, qvecReShiftedTPCpos, qvecImShiftedTPCpos, qvecAmp[kTPCpos], TrkTPCposLabel);
785-
qVectorTPCnegShiftedVec(IsCalibrated, qvecReShiftedTPCneg, qvecImShiftedTPCneg, qvecAmp[kTPCneg], TrkTPCnegLabel);
786-
qVectorTPCallShiftedVec(IsCalibrated, qvecReShiftedTPCall, qvecImShiftedTPCall, qvecAmp[kTPCall], TrkTPCallLabel);
787-
}
788-
789739
// Deprecated, will be removed in future after transition time //
790740
if (useDetector["QvectorBPoss"])
791741
qVectorBPos(IsCalibrated, qvecReTPCpos.at(0), qvecImTPCpos.at(0), qvecAmp[kTPCpos], TrkTPCposLabel);

‎Common/Tasks/qVectorsCorrection.cxx‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ using namespace o2;
4949
using namespace o2::framework;
5050

5151
using MyCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Qvectors>;
52-
using MyCollisionsWithSC = soa::Join<aod::Collisions, aod::EvSels, aod::QvectorsShifteds>;
5352
using MyTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TrackSelectionExtension>;
5453

5554
struct qVectorsCorrection {
@@ -757,49 +756,6 @@ struct qVectorsCorrection {
757756
}
758757
}
759758
PROCESS_SWITCH(qVectorsCorrection, processDefault, "default process", true);
760-
761-
void processWithSC(MyCollisionsWithSC::iterator const& qVec, MyTracks const& tracks)
762-
{
763-
histosQA.fill(HIST("histCentFull"), qVec.cent());
764-
if (cfgAddEvtSel) {
765-
if (std::abs(qVec.posZ()) > 10.)
766-
return;
767-
switch (cfgEvtSel) {
768-
case 0: // Sel8
769-
if (!qVec.sel8())
770-
return;
771-
break;
772-
case 1: // PbPb standard
773-
if (!qVec.sel8() || !qVec.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !qVec.selection_bit(aod::evsel::kNoSameBunchPileup))
774-
return;
775-
break;
776-
case 2: // PbPb with pileup
777-
if (!qVec.sel8() || !qVec.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ||
778-
!qVec.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) || !qVec.selection_bit(aod::evsel::kNoSameBunchPileup))
779-
return;
780-
break;
781-
case 3: // Small systems (OO, NeNe, pp)
782-
if (!qVec.sel8() || !qVec.selection_bit(aod::evsel::kNoSameBunchPileup))
783-
return;
784-
break;
785-
default:
786-
LOGF(warning, "Event selection flag was not found, continuing without basic event selections!\n");
787-
}
788-
// Check occupancy
789-
if (qVec.trackOccupancyInTimeRange() > cfgMaxOccupancy || qVec.trackOccupancyInTimeRange() < cfgMinOccupancy)
790-
return;
791-
}
792-
histosQA.fill(HIST("histCentSelected"), qVec.cent());
793-
histosQA.fill(HIST("histVtxSelected"), qVec.posZ());
794-
795-
for (uint i = 0; i < cfgnMods->size(); i++) {
796-
fillHistosQvecWithSC(qVec, cfgnMods->at(i));
797-
if (cfgQAFinal && cfgQAFlowStudy) {
798-
fillHistosFlowWithSC(qVec, tracks, cfgnMods->at(i));
799-
}
800-
}
801-
}
802-
PROCESS_SWITCH(qVectorsCorrection, processWithSC, "process with shift correction", false);
803759
};
804760

805761
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

0 commit comments

Comments
 (0)