Skip to content

Commit be545a4

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 42a7fe0 commit be545a4

3 files changed

Lines changed: 24 additions & 25 deletions

File tree

‎Common/DataModel/Qvectors.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@ DECLARE_SOA_TABLE(EseQvecTPCnegVecs, "AOD", "ESEQVECTPCNVEC", ese_qvec::IsCalibr
221221
DECLARE_SOA_TABLE(EseQvecTPCallVecs, "AOD", "ESEQVECTPCAVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCallReVec, ese_qvec::EseQvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);
222222

223223
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);
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);
230230

231231
using EseQvectorFT0C = EseQvecFT0Cs::iterator;
232232
using EseQvectorFT0A = EseQvecFT0As::iterator;

‎Common/TableProducer/qVectorsTable.cxx‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ struct qVectorsTable {
317317
auto modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
318318
if (!modeCorrQvecEse) {
319319
fullPath = cfgQvecCalibPath; // cfgQvecEseCalibPath;
320-
fullPath += "/v2"; // "/eseq2";
320+
fullPath += "/v2"; // "/eseq2";
321321
modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
322322
}
323323
corrsQvecEse.push_back(modeCorrQvecEse);
@@ -405,12 +405,12 @@ struct qVectorsTable {
405405
/// \param QvecImRaw is the vector with the raw imaginary part of the q-vector for each detector and correction step
406406
/// \param QvecAmp is the vector with the amplitude of the q-vector for each detector and correction step
407407
/// \param normType is the type of normalization to apply to the q-vectors
408-
void NormalizeQvec(std::vector<float>& QvecReNorm,
409-
std::vector<float>& QvecImNorm,
410-
std::vector<float> QvecReRaw,
411-
std::vector<float> QvecImRaw,
412-
std::vector<float>& QvecAmp,
413-
MultNorms normType)
408+
void NormalizeQvec(std::vector<float>& QvecReNorm,
409+
std::vector<float>& QvecImNorm,
410+
std::vector<float> QvecReRaw,
411+
std::vector<float> QvecImRaw,
412+
std::vector<float>& QvecAmp,
413+
MultNorms normType)
414414
{
415415
for (std::size_t i = 0; i < kNDetectors; i++) {
416416
float qVecDetReNorm{999.}, qVecDetImNorm{999.};
@@ -430,7 +430,7 @@ struct qVectorsTable {
430430
}
431431
std::cout << "[NORMALIZED] " << i << " Re: " << qVecDetReNorm << ", Im: " << qVecDetImNorm << ", amp: " << QvecAmp[i] << std::endl;
432432
}
433-
for (int iCorr=0; iCorr < Corrections::kNCorrections; iCorr++) {
433+
for (int iCorr = 0; iCorr < Corrections::kNCorrections; iCorr++) {
434434
QvecReNorm.push_back(qVecDetReNorm);
435435
QvecImNorm.push_back(qVecDetImNorm);
436436
}
@@ -443,7 +443,8 @@ struct qVectorsTable {
443443
/// \param qvecIm is the vector with the imaginary part of the q-vector for each detector and correction step
444444
/// \param histsCorrs is the vector with the histograms with the correction constants for each detector and correction step
445445
/// \param nMode is the modulation of interest
446-
void CorrectQvec(float cent, std::vector<float>& qvecRe, std::vector<float>& qvecIm, TH3F* histsCorrs, int nMode) {
446+
void CorrectQvec(float cent, std::vector<float>& qvecRe, std::vector<float>& qvecIm, TH3F* histsCorrs, int nMode)
447+
{
447448
int nCorrections = static_cast<int>(Corrections::kNCorrections);
448449
if (cent < cfgMaxCentrality) {
449450
for (auto i{0u}; i < kTPCall + 1; i++) {
@@ -563,9 +564,9 @@ struct qVectorsTable {
563564
float qVectFT0C[2] = {-999., -999.};
564565
float qVectFT0M[2] = {-999., -999.};
565566
float qVectFV0A[2] = {-999., -999.};
566-
float qVectTPCpos[2] = {0., 0.}; // Always computed
567-
float qVectTPCneg[2] = {0., 0.}; // Always computed
568-
float qVectTPCall[2] = {0., 0.}; // Always computed
567+
float qVectTPCpos[2] = {0., 0.}; // Always computed
568+
float qVectTPCneg[2] = {0., 0.}; // Always computed
569+
float qVectTPCall[2] = {0., 0.}; // Always computed
569570

570571
TComplex QvecDet(0);
571572
TComplex QvecFT0M(0);
@@ -703,7 +704,6 @@ struct qVectorsTable {
703704
LOG(info) << "[RAW] qVectTPCpos: " << qVectTPCpos[0] << ", " << qVectTPCpos[1] << ", nTrk: " << nTrkTPCpos;
704705
LOG(info) << "[RAW] qVectTPCneg: " << qVectTPCneg[0] << ", " << qVectTPCneg[1] << ", nTrk: " << nTrkTPCneg;
705706
LOG(info) << "[RAW] qVectTPCall: " << qVectTPCall[0] << ", " << qVectTPCall[1] << ", nTrk: " << nTrkTPCall;
706-
707707
}
708708

709709
void process(MyCollisions::iterator const& coll, aod::BCsWithTimestamps const&, aod::FT0s const&, aod::FV0As const&, MyTracks const& tracks)
@@ -852,7 +852,6 @@ struct qVectorsTable {
852852
std::cout << "[CORRECTED] TPCneg, Re: " << qvecReTPCnegSp.at(0) << ", Im: " << qvecImTPCnegSp.at(0) << std::endl;
853853
std::cout << "[CORRECTED] TPCall, Re: " << qvecReTPCallSp.at(0) << ", Im: " << qvecImTPCallSp.at(0) << std::endl;
854854

855-
856855
qVectorFT0CVec(IsCalibrated, qvecReFT0CSp, qvecImFT0CSp, qvecAmp[kFT0C]);
857856
qVectorFT0AVec(IsCalibrated, qvecReFT0ASp, qvecImFT0ASp, qvecAmp[kFT0A]);
858857
qVectorFT0MVec(IsCalibrated, qvecReFT0MSp, qvecImFT0MSp, qvecAmp[kFT0M]);

‎PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -971,11 +971,11 @@ struct HfTaskFlowCharmHadrons {
971971
o2::hf_centrality::getCentralityColl(collision, centEstimatorsForSparse->at(2)), o2::hf_centrality::getCentralityColl(collision, centEstimatorsForSparse->at(3)));
972972
}
973973
if (storeRedQVec) {
974-
registry.fill(HIST("redQVecs/hSparseRedQVecs"), centrality,
975-
std::hypot(collision.eseQvecFT0CRe(), collision.eseQvecFT0CIm()),
976-
std::hypot(collision.eseQvecTPCposRe(), collision.eseQvecTPCposIm()),
977-
std::hypot(collision.eseQvecTPCnegRe(), collision.eseQvecTPCnegIm()),
978-
std::hypot(collision.eseQvecTPCallRe(), collision.eseQvecTPCallIm()));
974+
registry.fill(HIST("redQVecs/hSparseRedQVecs"), centrality,
975+
std::hypot(collision.eseQvecFT0CRe(), collision.eseQvecFT0CIm()),
976+
std::hypot(collision.eseQvecTPCposRe(), collision.eseQvecTPCposIm()),
977+
std::hypot(collision.eseQvecTPCnegRe(), collision.eseQvecTPCnegIm()),
978+
std::hypot(collision.eseQvecTPCallRe(), collision.eseQvecTPCallIm()));
979979
}
980980

981981
if (!isCollSelected<o2::hf_centrality::CentralityEstimator::FT0C>(collision, bcs, centrality)) {

0 commit comments

Comments
 (0)