Skip to content

[PWGHF] taskFlow.cxx : solve issue with CorrelationContainer #15279

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
apalasciano merged 9 commits into from
Mar 10, 2026
+44 −43
Merged

[PWGHF] taskFlow.cxx : solve issue with CorrelationContainer #15279

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
131f855
add gain equalization for FT0C
AlexianL Feb 2, 2026
33a5a12
add sampling axis
AlexianL Feb 3, 2026
59a4263
add more event selection
AlexianL Feb 3, 2026
2d27a92
add event selection based on RCT flags
AlexianL Feb 4, 2026
bb8659e
add event sel
AlexianL Feb 20, 2026
2ca5480
correct filling of corr container
AlexianL Feb 26, 2026
eb39eb2
correct problem
AlexianL Mar 5, 2026
4e6b503
solve github issues
AlexianL Mar 5, 2026
d0b2ffe
Merge branch 'master' into add_FT0_gain_eq
AlexianL Mar 5, 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
87 changes: 44 additions & 43 deletions PWGHF/HFC/Tasks/taskFlow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,10 @@ struct HfTaskFlow {
std::vector<AxisSpec> const effAxis = {{configAxis.axisEtaEfficiency, "#eta"},
{configAxis.axisPtEfficiency, "p_{T} (GeV/c)"},
{configAxis.axisVertexEfficiency, "z-vtx (cm)"}};
std::vector<AxisSpec> const userAxis = {{configAxis.axisSamples, "sampling"}};
std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"},
{configAxis.axisSamples, "sampling"}};
std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"}};
// std::vector<AxisSpec> const userAxis = {{configAxis.axisSamples, "sampling"}};
// std::vector<AxisSpec> const hfUserAxis = {{configAxis.axisMass, "m_{inv} (GeV/c^{2})"},
// {configAxis.axisSamples, "sampling"}};

// =========================
// Initialization of histograms and CorrelationContainers for TpcTpc cases
Expand All @@ -546,8 +547,8 @@ struct HfTaskFlow {
if (doprocessSameTpcTpcChCh) {
addHistograms<Data, TpcTpc, ChPartChPart>();

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

if (doprocessSameTpcTpcD0Ch) {
Expand All @@ -572,8 +573,8 @@ struct HfTaskFlow {
addHistograms<Data, TpcMft, ChPartChPart>();
addMftHistograms();

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

if (doprocessSameTpcMftD0Ch || doprocessSameTpcMftD0ChReassociated) {
Expand All @@ -599,8 +600,8 @@ struct HfTaskFlow {
if (doprocessSameTpcFv0aChCh) {
addHistograms<Data, TpcFv0a, ChPartChPart>();

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

if (doprocessSameTpcFv0aD0Ch) {
Expand All @@ -626,8 +627,8 @@ struct HfTaskFlow {
addHistograms<Data, MftFv0a, ChPartChPart>();
addMftHistograms();

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

// =========================
Expand All @@ -639,8 +640,8 @@ struct HfTaskFlow {
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

if (doprocessSameTpcFt0aD0Ch) {
Expand Down Expand Up @@ -671,8 +672,8 @@ struct HfTaskFlow {
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

// =========================
Expand All @@ -684,8 +685,8 @@ struct HfTaskFlow {
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

if (doprocessSameTpcFt0cD0Ch) {
Expand Down Expand Up @@ -715,8 +716,8 @@ struct HfTaskFlow {
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
registry.add("Data/FT0AmpCorr", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});

sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, userAxis));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, userAxis));
sameEvent.setObject(new CorrelationContainer("sameEvent", "sameEvent", corrAxis, effAxis, {}));
mixedEvent.setObject(new CorrelationContainer("mixedEvent", "mixedEvent", corrAxis, effAxis, {}));
}

} // End of init() function
Expand Down Expand Up @@ -1156,7 +1157,7 @@ struct HfTaskFlow {
auto triggerWeight = 1;
auto associatedWeight = 1;
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);

// TRIGGER PARTICLE
for (const auto& track1 : tracks1) {
Expand Down Expand Up @@ -1192,9 +1193,9 @@ struct HfTaskFlow {

// fill single-track distributions
if (!fillingHFcontainer) { // if not HF-h case
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
} else {
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
}

// FILL QA PLOTS for trigger particle
Expand Down Expand Up @@ -1319,10 +1320,10 @@ struct HfTaskFlow {

if (!fillingHFcontainer) {
// fill pair correlations
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
triggerWeight * associatedWeight);
} else {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
triggerWeight * associatedWeight);
}

Expand Down Expand Up @@ -1362,7 +1363,7 @@ struct HfTaskFlow {
auto triggerWeight = 1;
auto associatedWeight = 1;
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
Copy link
Collaborator

@gluparel gluparel Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have you commented this line? If you do not use it any more, better to remove?

Copy link
Contributor Author

@AlexianL AlexianL Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still plan to use that line on a later PR, but it was involved in the issue I corrected. So I thought I could let it here until I understand how to implement it without creating an issue.


// TRIGGER PARTICLE
for (const auto& track1 : tracks1) {
Expand Down Expand Up @@ -1394,9 +1395,9 @@ struct HfTaskFlow {

// fill single-track distributions
if (!fillingHFcontainer) { // if not HF-h case
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
} else {
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
}

// FILL QA PLOTS for trigger particle
Expand Down Expand Up @@ -1487,10 +1488,10 @@ struct HfTaskFlow {
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf);

if (!fillingHFcontainer) {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ,
triggerWeight * associatedWeight);
} else {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
target->getPairHist()->Fill(step, eta1 - eta2, pt2, pt1, multiplicity, deltaPhi, posZ, invmass,
triggerWeight * associatedWeight);
}

Expand Down Expand Up @@ -1519,7 +1520,7 @@ struct HfTaskFlow {
auto triggerWeight = 1;
auto associatedWeight = 1;
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);

// TRIGGER PARTICLE
for (auto const& track1 : tracks1) {
Expand Down Expand Up @@ -1558,9 +1559,9 @@ struct HfTaskFlow {

// fill single-track distributions
if (!fillingHFcontainer) { // if not HF-h case
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);
} else {
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, invmass, triggerWeight);
}

// FILL QA PLOTS for trigger particle
Expand Down Expand Up @@ -1620,10 +1621,10 @@ struct HfTaskFlow {
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)

if (!fillingHFcontainer) {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
triggerWeight * associatedWeight);
} else {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
triggerWeight * associatedWeight);
}

Expand Down Expand Up @@ -1668,10 +1669,10 @@ struct HfTaskFlow {
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)

if (!fillingHFcontainer) {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
amplitude * triggerWeight * associatedWeight);
} else {
target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ, invmass,
amplitude * triggerWeight * associatedWeight);
}

Expand Down Expand Up @@ -1719,7 +1720,7 @@ struct HfTaskFlow {
auto triggerWeight = 1;
auto associatedWeight = 1;
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);

// TRIGGER PARTICLE
for (auto const& track1 : tracks1) {
Expand All @@ -1742,7 +1743,7 @@ struct HfTaskFlow {
float phi1 = reassociatedMftTrack.phi();
o2::math_utils::bringTo02Pi(phi1);

target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, sampleIndex, triggerWeight);
target->getTriggerHist()->Fill(step, pt1, multiplicity, posZ, triggerWeight);

// FILL QA PLOTS for trigger particle
if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
Expand All @@ -1766,7 +1767,7 @@ struct HfTaskFlow {
float deltaPhi = phi1 - phi2;
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)

target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
triggerWeight * associatedWeight);

// FILL QA PLOTS for associated particle
Expand Down Expand Up @@ -1799,7 +1800,7 @@ struct HfTaskFlow {
float deltaPhi = phi1 - phi2;
deltaPhi = RecoDecay::constrainAngle(deltaPhi, -PIHalf); // set range of delta phi in (-pi/2 , 3/2*pi)

target->getPairHist()->Fill(step, sampleIndex, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, eta1 - eta2, pt1, pt1, multiplicity, deltaPhi, posZ,
amplitude * triggerWeight * associatedWeight);

// FILL QA PLOTS for associated particle
Expand All @@ -1821,7 +1822,7 @@ struct HfTaskFlow {
auto triggerWeight = 1;
auto associatedWeight = 1;
auto loopCounter = 0; // To avoid filling associated tracks QA many times, I fill it only for the first trigger track of the collision
int sampleIndex = gRandom->Uniform(0, configTask.nSamples);
// int sampleIndex = gRandom->Uniform(0, configTask.nSamples);

// TRIGGER PARTICLE FROM FT0A
for (std::size_t indexChannelA = 0; indexChannelA < ft0as.channelA().size(); indexChannelA++) {
Expand All @@ -1832,7 +1833,7 @@ struct HfTaskFlow {
auto phiA = getPhiFT0(channelIdA, isFT0A);
auto etaA = getEtaFT0(channelIdA, isFT0A);

target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, sampleIndex, amplitude * triggerWeight);
target->getTriggerHist()->Fill(step, 0.f, multiplicity, posZ, amplitude * triggerWeight);

if (sameEvent && (step == CorrelationContainer::kCFStepReconstructed)) {
fillTriggerQa<Data, Ft0aFt0c, ChPartChPart>(multiplicity, etaA, phiA, 0.f);
Expand All @@ -1848,7 +1849,7 @@ struct HfTaskFlow {
auto etaC = getEtaFT0(channelIdC, isFT0C);
float deltaPhi = RecoDecay::constrainAngle(phiA - phiC, -PIHalf);

target->getPairHist()->Fill(step, sampleIndex, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ,
target->getPairHist()->Fill(step, etaA - etaC, 0.f, 0.f, multiplicity, deltaPhi, posZ,
amplitude * triggerWeight * associatedWeight);

if (sameEvent && (loopCounter == 1) && (step == CorrelationContainer::kCFStepReconstructed)) {
Expand Down
Loading