Skip to content

[PWGCF] Flow-decorr fix1, diHadron error test #17932

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

Closed
lcernusa wants to merge 2 commits into from
+7 −20
Closed

[PWGCF] Flow-decorr fix1, diHadron error test #17932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f9da8
[PWGCF] test decorr fix
lcernusa Sep 16, 2026
89c0d67
[PWGCF] Test diHadron needed changes
lcernusa Sep 16, 2026
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
4 changes: 2 additions & 2 deletions PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct DiHadronCor {
O2_DEFINE_CONFIGURABLE(cfgEfficiency, std::string, "", "CCDB path to efficiency object")
O2_DEFINE_CONFIGURABLE(cfgCentralityWeight, std::string, "", "CCDB path to centrality weight object")
O2_DEFINE_CONFIGURABLE(cfgLocalEfficiency, bool, false, "Use local efficiency object")
O2_DEFINE_CONFIGURABLE(cfgVerbosity, bool, false, "Verbose output")
O2_DEFINE_CONFIGURABLE(cfgVerbosity2, bool, false, "Verbose output")
O2_DEFINE_CONFIGURABLE(cfgUseEventWeights, bool, false, "Use event weights for mixed event")
O2_DEFINE_CONFIGURABLE(cfgUsePtOrder, bool, true, "enable trigger pT < associated pT cut")
O2_DEFINE_CONFIGURABLE(cfgUsePtOrderInMixEvent, bool, true, "enable trigger pT < associated pT cut in mixed event")
Expand Down Expand Up @@ -1107,7 +1107,7 @@ struct DiHadronCor {
continue;

auto groupedCollisions = collisions.sliceBy(collisionPerMCCollision, collision1.globalIndex());
if (cfgVerbosity > 0) {
if (cfgVerbosity2 > 0) {
LOGF(info, "Found %d related collisions", groupedCollisions.size());
}
float cent = -1;
Expand Down
23 changes: 5 additions & 18 deletions PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ struct FlowDecorrelation {
o2::ft0::Geometry ft0Det;
o2::fv0::Geometry* fv0Det{};
static constexpr uint64_t Ft0IndexA = 96;
std::vector<o2::detectors::AlignParam>* offsetFT0;
std::vector<o2::detectors::AlignParam>* offsetFV0;
std::vector<o2::detectors::AlignParam>* offsetFT0{}; //!!!
std::vector<o2::detectors::AlignParam>* offsetFV0{}; //!!!
std::vector<float> cstFT0RelGain{};

// Corrections
Expand Down Expand Up @@ -256,9 +256,6 @@ struct FlowDecorrelation {
kFT0COuterRingMin = 144,
kFT0COuterRingMax = 207
};
std::array<float, 6> tofNsigmaCut;
std::array<float, 6> itsNsigmaCut;
std::array<float, 6> tpcNsigmaCut;
struct Ft0cCConstants {
double zFt0cDistance = -83.44;
double maxWidth = 12.;
Expand All @@ -283,7 +280,6 @@ struct FlowDecorrelation {
LOGF(fatal, "Centrality table is unavailable, cannot select collisions by centrality");
}
const AxisSpec axisPhi{72, 0.0, constants::math::TwoPI, "#varphi"};
const AxisSpec axisEta{40, -1., 1., "#eta"};
const AxisSpec axisEtaFull{90, -6., 6., "#eta"};
const AxisSpec axisCentrality{20, 0., 100., "cent"};

Expand Down Expand Up @@ -671,14 +667,14 @@ struct FlowDecorrelation {
if (mEfficiency == nullptr) {
LOGF(fatal, "Could not load efficiency histogram for trigger particles from %s", cfgEfficiency.value.c_str());
}
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), (void*)mEfficiency);
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgEfficiency.value.c_str(), static_cast<void*>(mEfficiency));
}
if (cfgCentralityWeight.value.empty() == false) {
mCentralityWeight = ccdb->getForTimeStamp<TH1D>(cfgCentralityWeight, timestamp);
if (mCentralityWeight == nullptr) {
LOGF(fatal, "Could not load efficiency histogram for trigger particles from %s", cfgCentralityWeight.value.c_str());
}
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgCentralityWeight.value.c_str(), (void*)mCentralityWeight);
LOGF(info, "Loaded efficiency histogram from %s (%p)", cfgCentralityWeight.value.c_str(), static_cast<void*>(mCentralityWeight));
}
correctionsLoaded = true;
}
Expand Down Expand Up @@ -1093,8 +1089,6 @@ struct FlowDecorrelation {
if (y < (Ft0aLocations.blockFar + Ft0aLocations.offSetY) && y > (Ft0aLocations.blockClose + Ft0aLocations.offSetY)) {
return true;
}
}
if (x < (Ft0aLocations.blockFar + Ft0aLocations.offSetX) && x > (Ft0aLocations.blockClose + Ft0aLocations.offSetX)) {
if (y > (-Ft0aLocations.blockFar + Ft0aLocations.offSetY) && y < (-Ft0aLocations.blockClose + Ft0aLocations.offSetY)) {
return true;
}
Expand All @@ -1104,8 +1098,6 @@ struct FlowDecorrelation {
if (y < (Ft0aLocations.blockFar + Ft0aLocations.offSetY) && y > (Ft0aLocations.blockClose + Ft0aLocations.offSetY)) {
return true;
}
}
if (x > (-Ft0aLocations.blockFar + Ft0aLocations.offSetX) && x < (-Ft0aLocations.blockClose + Ft0aLocations.offSetX)) {
if (y > (-Ft0aLocations.blockFar + Ft0aLocations.offSetY) && y < (-Ft0aLocations.blockClose + Ft0aLocations.offSetY)) {
return true;
}
Expand All @@ -1115,9 +1107,6 @@ struct FlowDecorrelation {
if (y > (-Ft0aLocations.blockFar + Ft0aLocations.offSetY - Ft0aLocations.rectOffSet) && y < (-Ft0aLocations.blockClose + Ft0aLocations.offSetY - Ft0aLocations.rectOffSet)) {
return true;
}
}

if (x < (Ft0aLocations.blockClose + Ft0aLocations.offSetX) && x > (-Ft0aLocations.blockClose + Ft0aLocations.offSetX)) {
if (y < (Ft0aLocations.blockFar + Ft0aLocations.offSetY + Ft0aLocations.rectOffSet) && y > (Ft0aLocations.blockClose + Ft0aLocations.offSetY + Ft0aLocations.rectOffSet)) {
return true;
}
Expand All @@ -1127,13 +1116,11 @@ struct FlowDecorrelation {
if (x > (-Ft0aLocations.blockFar + Ft0aLocations.offSetX - Ft0aLocations.rectOffSet) && x < (-Ft0aLocations.blockClose + Ft0aLocations.offSetX - Ft0aLocations.rectOffSet)) {
return true;
}
}

if (y < (Ft0aLocations.blockClose + Ft0aLocations.offSetY) && y > (-Ft0aLocations.blockClose + Ft0aLocations.offSetY)) {
if (x < (Ft0aLocations.blockFar + Ft0aLocations.offSetX + Ft0aLocations.rectOffSet) && x > (Ft0aLocations.blockClose + Ft0aLocations.offSetX + Ft0aLocations.rectOffSet)) {
return true;
}
}

return false;
}

Expand Down
Loading