From 5690bee61fb080533ecb183973bb9619f00a454c Mon Sep 17 00:00:00 2001 From: lcernusa Date: Sat, 21 Feb 2026 19:44:42 +0100 Subject: [PATCH 1/5] [PWGCF] Added missing if statement for run-by-run --- .../Tasks/longRangeDihadronCor.cxx | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx index 3977ba0edac..8f4b5b87d5a 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx @@ -54,10 +54,7 @@ #include "TRandom3.h" #include -#include -#include #include -#include #include using namespace o2; @@ -691,8 +688,9 @@ struct LongRangeDihadronCor { ampl = ampl / cstFT0RelGain[id]; if (system == SameEvent) { registry.fill(HIST("FT0AmpCorrect"), id, ampl); - histAmpCorrectPerRun[lastRunNumber]->Fill(id, ampl); - } + if (cfgFwdConfig.cfgRunbyRunAmplitudeFT0) + histAmpCorrectPerRun[lastRunNumber]->Fill(id, ampl); + } } else if (fitType == kFT0A) { id = ft0.channelA()[iCh]; ampl = ft0.amplitudeA()[iCh]; @@ -703,7 +701,8 @@ struct LongRangeDihadronCor { ampl = ampl / cstFT0RelGain[id]; if (system == SameEvent) { registry.fill(HIST("FT0AmpCorrect"), id, ampl); - histAmpCorrectPerRun[lastRunNumber]->Fill(id, ampl); + if (cfgFwdConfig.cfgRunbyRunAmplitudeFT0) + histAmpCorrectPerRun[lastRunNumber]->Fill(id, ampl); } } else { LOGF(fatal, "Cor Index %d out of range", fitType); @@ -843,7 +842,7 @@ struct LongRangeDihadronCor { bool mirrorChannelA = false; if (cfgFwdConfig.cfgMirrorFT0ADeadChannels) mirrorChannelA = isMirrorId(chanelAid, kFT0A); - + if (system == SameEvent) { registry.fill(HIST("Trig_hist_FT0A_FT0C"), fSampleIndex, posZ, 0.5, eventWeight * amplA); } @@ -860,7 +859,7 @@ struct LongRangeDihadronCor { bool mirrorChannelC = false; if (cfgFwdConfig.cfgMirrorFT0CDeadChannels) mirrorChannelC = isMirrorId(chanelCid, kFT0C); - + // fill the right sparse and histograms if (system == SameEvent) { registry.fill(HIST("deltaEta_deltaPhi_same_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); @@ -874,11 +873,11 @@ struct LongRangeDihadronCor { sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); } else if (system == MixedEvent) { registry.fill(HIST("deltaEta_deltaPhi_mixed_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); - mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); + mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); if (mirrorChannelA) { mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA + 2 * PIHalf - phiC, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); if (mirrorChannelC) - mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); + mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); } if (mirrorChannelC) mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); @@ -1252,7 +1251,7 @@ struct LongRangeDihadronCor { return; } - int currentRunNumber = bc.runNumber(); + int currentRunNumber = bc.runNumber(); if (cfgFwdConfig.cfgRunbyRunAmplitudeFT0 && currentRunNumber != lastRunNumber) { lastRunNumber = currentRunNumber; if (std::find(runNumbers.begin(), runNumbers.end(), currentRunNumber) == runNumbers.end()) { From 4b70feb2a7d0345c5649272c33fd71bcdb0b5267 Mon Sep 17 00:00:00 2001 From: lcernusa Date: Sat, 21 Feb 2026 20:00:45 +0100 Subject: [PATCH 2/5] Add files via upload [PWGCF] Solved run-by-run history bug --- .../Tasks/longRangeDihadronCor.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx index 8f4b5b87d5a..fbc5bcf3f65 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx @@ -690,7 +690,7 @@ struct LongRangeDihadronCor { registry.fill(HIST("FT0AmpCorrect"), id, ampl); if (cfgFwdConfig.cfgRunbyRunAmplitudeFT0) histAmpCorrectPerRun[lastRunNumber]->Fill(id, ampl); - } + } } else if (fitType == kFT0A) { id = ft0.channelA()[iCh]; ampl = ft0.amplitudeA()[iCh]; @@ -842,7 +842,7 @@ struct LongRangeDihadronCor { bool mirrorChannelA = false; if (cfgFwdConfig.cfgMirrorFT0ADeadChannels) mirrorChannelA = isMirrorId(chanelAid, kFT0A); - + if (system == SameEvent) { registry.fill(HIST("Trig_hist_FT0A_FT0C"), fSampleIndex, posZ, 0.5, eventWeight * amplA); } @@ -859,7 +859,7 @@ struct LongRangeDihadronCor { bool mirrorChannelC = false; if (cfgFwdConfig.cfgMirrorFT0CDeadChannels) mirrorChannelC = isMirrorId(chanelCid, kFT0C); - + // fill the right sparse and histograms if (system == SameEvent) { registry.fill(HIST("deltaEta_deltaPhi_same_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); @@ -873,11 +873,11 @@ struct LongRangeDihadronCor { sameFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); } else if (system == MixedEvent) { registry.fill(HIST("deltaEta_deltaPhi_mixed_FT0A_FT0C"), deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); - mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); + mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); if (mirrorChannelA) { mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA + 2 * PIHalf - phiC, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); if (mirrorChannelC) - mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); + mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, deltaPhi, deltaEta, amplA * amplC * eventWeight * triggerWeight); } if (mirrorChannelC) mixedFt0aFt0c->getPairHist()->Fill(step, fSampleIndex, posZ, 0.5, 0.5, RecoDecay::constrainAngle(phiA - phiC - 2 * PIHalf, -PIHalf), deltaEta, amplA * amplC * eventWeight * triggerWeight); @@ -1251,7 +1251,7 @@ struct LongRangeDihadronCor { return; } - int currentRunNumber = bc.runNumber(); + int currentRunNumber = bc.runNumber(); if (cfgFwdConfig.cfgRunbyRunAmplitudeFT0 && currentRunNumber != lastRunNumber) { lastRunNumber = currentRunNumber; if (std::find(runNumbers.begin(), runNumbers.end(), currentRunNumber) == runNumbers.end()) { From 255b19297e832d71977a84288c2bdbad2f88dc85 Mon Sep 17 00:00:00 2001 From: lcernusa Date: Sun, 22 Feb 2026 12:27:41 +0100 Subject: [PATCH 3/5] [PWGCF] Fixed missing includes --- PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx index fbc5bcf3f65..380ab38c9b9 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx @@ -56,6 +56,10 @@ #include #include +#include +#include +#include + using namespace o2; using namespace o2::framework; From c55c8b8efaa12a86f3dc060861fadac6111e748d Mon Sep 17 00:00:00 2001 From: lcernusa Date: Sun, 22 Feb 2026 12:31:17 +0100 Subject: [PATCH 4/5] Solved formating issue --- .../TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx index 380ab38c9b9..d3967ad0d4d 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx @@ -54,11 +54,11 @@ #include "TRandom3.h" #include -#include -#include #include -#include #include +#include +#include +#include using namespace o2; From f0d455ff61803512d354f13e592d5a90b3994963 Mon Sep 17 00:00:00 2001 From: lcernusa Date: Sun, 22 Feb 2026 15:39:06 +0100 Subject: [PATCH 5/5] Corrected formating error --- PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx index d3967ad0d4d..f50d8f15e6c 100644 --- a/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx +++ b/PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx @@ -60,7 +60,6 @@ #include #include - using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions;