Skip to content

Please consider the following formatting changes to #15636 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marcellocosti merged 1 commit into from
Apr 28, 2026
Merged

Please consider the following formatting changes to #15636 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Common/DataModel/Qvectors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ DECLARE_SOA_TABLE(EseQvecTPCnegVecs, "AOD", "ESEQVECTPCNVEC", ese_qvec::IsCalibr
DECLARE_SOA_TABLE(EseQvecTPCallVecs, "AOD", "ESEQVECTPCAVEC", ese_qvec::IsCalibrated, ese_qvec::EseQvecTPCallReVec, ese_qvec::EseQvecTPCallImVec, qvec::NTrkTPCall, qvec::LabelsTPCall);

DECLARE_SOA_TABLE(EseQvecPercs, "AOD", "ESEQVECPERC", ese_qvec::EseQvecFT0CRe, ese_qvec::EseQvecFT0CIm, qvec::SumAmplFT0C,
ese_qvec::EseQvecFT0ARe, ese_qvec::EseQvecFT0AIm, qvec::SumAmplFT0A,
ese_qvec::EseQvecFT0MRe, ese_qvec::EseQvecFT0MIm, qvec::SumAmplFT0M,
ese_qvec::EseQvecFV0ARe, ese_qvec::EseQvecFV0AIm, qvec::SumAmplFV0A,
ese_qvec::EseQvecTPCposRe, ese_qvec::EseQvecTPCposIm, qvec::NTrkTPCpos,
ese_qvec::EseQvecTPCnegRe, ese_qvec::EseQvecTPCnegIm, qvec::NTrkTPCneg,
ese_qvec::EseQvecTPCallRe, ese_qvec::EseQvecTPCallIm, qvec::NTrkTPCall);
ese_qvec::EseQvecFT0ARe, ese_qvec::EseQvecFT0AIm, qvec::SumAmplFT0A,
ese_qvec::EseQvecFT0MRe, ese_qvec::EseQvecFT0MIm, qvec::SumAmplFT0M,
ese_qvec::EseQvecFV0ARe, ese_qvec::EseQvecFV0AIm, qvec::SumAmplFV0A,
ese_qvec::EseQvecTPCposRe, ese_qvec::EseQvecTPCposIm, qvec::NTrkTPCpos,
ese_qvec::EseQvecTPCnegRe, ese_qvec::EseQvecTPCnegIm, qvec::NTrkTPCneg,
ese_qvec::EseQvecTPCallRe, ese_qvec::EseQvecTPCallIm, qvec::NTrkTPCall);

using EseQvectorFT0C = EseQvecFT0Cs::iterator;
using EseQvectorFT0A = EseQvecFT0As::iterator;
Expand Down
27 changes: 13 additions & 14 deletions Common/TableProducer/qVectorsTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ struct qVectorsTable {
auto modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
if (!modeCorrQvecEse) {
fullPath = cfgQvecCalibPath; // cfgQvecEseCalibPath;
fullPath += "/v2"; // "/eseq2";
fullPath += "/v2"; // "/eseq2";
modeCorrQvecEse = getForTsOrRun<TH3F>(fullPath, timestamp, runnumber);
}
corrsQvecEse.push_back(modeCorrQvecEse);
Expand Down Expand Up @@ -405,12 +405,12 @@ struct qVectorsTable {
/// \param QvecImRaw is the vector with the raw imaginary part of the q-vector for each detector and correction step
/// \param QvecAmp is the vector with the amplitude of the q-vector for each detector and correction step
/// \param normType is the type of normalization to apply to the q-vectors
void NormalizeQvec(std::vector<float>& QvecReNorm,
std::vector<float>& QvecImNorm,
std::vector<float> QvecReRaw,
std::vector<float> QvecImRaw,
std::vector<float>& QvecAmp,
MultNorms normType)
void NormalizeQvec(std::vector<float>& QvecReNorm,
std::vector<float>& QvecImNorm,
std::vector<float> QvecReRaw,
std::vector<float> QvecImRaw,
std::vector<float>& QvecAmp,
MultNorms normType)
{
for (std::size_t i = 0; i < kNDetectors; i++) {
float qVecDetReNorm{999.}, qVecDetImNorm{999.};
Expand All @@ -430,7 +430,7 @@ struct qVectorsTable {
}
std::cout << "[NORMALIZED] " << i << " Re: " << qVecDetReNorm << ", Im: " << qVecDetImNorm << ", amp: " << QvecAmp[i] << std::endl;
}
for (int iCorr=0; iCorr < Corrections::kNCorrections; iCorr++) {
for (int iCorr = 0; iCorr < Corrections::kNCorrections; iCorr++) {
QvecReNorm.push_back(qVecDetReNorm);
QvecImNorm.push_back(qVecDetImNorm);
}
Expand All @@ -443,7 +443,8 @@ struct qVectorsTable {
/// \param qvecIm is the vector with the imaginary part of the q-vector for each detector and correction step
/// \param histsCorrs is the vector with the histograms with the correction constants for each detector and correction step
/// \param nMode is the modulation of interest
void CorrectQvec(float cent, std::vector<float>& qvecRe, std::vector<float>& qvecIm, TH3F* histsCorrs, int nMode) {
void CorrectQvec(float cent, std::vector<float>& qvecRe, std::vector<float>& qvecIm, TH3F* histsCorrs, int nMode)
{
int nCorrections = static_cast<int>(Corrections::kNCorrections);
if (cent < cfgMaxCentrality) {
for (auto i{0u}; i < kTPCall + 1; i++) {
Expand Down Expand Up @@ -563,9 +564,9 @@ struct qVectorsTable {
float qVectFT0C[2] = {-999., -999.};
float qVectFT0M[2] = {-999., -999.};
float qVectFV0A[2] = {-999., -999.};
float qVectTPCpos[2] = {0., 0.}; // Always computed
float qVectTPCneg[2] = {0., 0.}; // Always computed
float qVectTPCall[2] = {0., 0.}; // Always computed
float qVectTPCpos[2] = {0., 0.}; // Always computed
float qVectTPCneg[2] = {0., 0.}; // Always computed
float qVectTPCall[2] = {0., 0.}; // Always computed

TComplex QvecDet(0);
TComplex QvecFT0M(0);
Expand Down Expand Up @@ -703,7 +704,6 @@ struct qVectorsTable {
LOG(info) << "[RAW] qVectTPCpos: " << qVectTPCpos[0] << ", " << qVectTPCpos[1] << ", nTrk: " << nTrkTPCpos;
LOG(info) << "[RAW] qVectTPCneg: " << qVectTPCneg[0] << ", " << qVectTPCneg[1] << ", nTrk: " << nTrkTPCneg;
LOG(info) << "[RAW] qVectTPCall: " << qVectTPCall[0] << ", " << qVectTPCall[1] << ", nTrk: " << nTrkTPCall;

}

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


qVectorFT0CVec(IsCalibrated, qvecReFT0CSp, qvecImFT0CSp, qvecAmp[kFT0C]);
qVectorFT0AVec(IsCalibrated, qvecReFT0ASp, qvecImFT0ASp, qvecAmp[kFT0A]);
qVectorFT0MVec(IsCalibrated, qvecReFT0MSp, qvecImFT0MSp, qvecAmp[kFT0M]);
Expand Down
10 changes: 5 additions & 5 deletions PWGHF/D2H/Tasks/taskFlowCharmHadrons.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,11 +971,11 @@ struct HfTaskFlowCharmHadrons {
o2::hf_centrality::getCentralityColl(collision, centEstimatorsForSparse->at(2)), o2::hf_centrality::getCentralityColl(collision, centEstimatorsForSparse->at(3)));
}
if (storeRedQVec) {
registry.fill(HIST("redQVecs/hSparseRedQVecs"), centrality,
std::hypot(collision.eseQvecFT0CRe(), collision.eseQvecFT0CIm()),
std::hypot(collision.eseQvecTPCposRe(), collision.eseQvecTPCposIm()),
std::hypot(collision.eseQvecTPCnegRe(), collision.eseQvecTPCnegIm()),
std::hypot(collision.eseQvecTPCallRe(), collision.eseQvecTPCallIm()));
registry.fill(HIST("redQVecs/hSparseRedQVecs"), centrality,
std::hypot(collision.eseQvecFT0CRe(), collision.eseQvecFT0CIm()),
std::hypot(collision.eseQvecTPCposRe(), collision.eseQvecTPCposIm()),
std::hypot(collision.eseQvecTPCnegRe(), collision.eseQvecTPCnegIm()),
std::hypot(collision.eseQvecTPCallRe(), collision.eseQvecTPCallIm()));
}

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