From 473b6610169d43dfacba9e94a45d8d608b0936e5 Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Sun, 16 Aug 2026 22:19:26 -0500 Subject: [PATCH 1/9] made NoSameBunchPileup configurable and removed obsolete variables --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index b2a2f46d415..0e0d51ae8f0 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -76,13 +76,10 @@ struct FlowZdcTask { Configurable maxNch{"maxNch", 2500, "Max Nch (|eta|<0.8)"}; Configurable nBinsTDC{"nBinsTDC", 150, "nbinsTDC"}; Configurable nBinsCent{"nBinsCent", 10, "nBinsCent"}; - Configurable minTdcZn{"minTdcZn", 4.0, "minimum TDC for ZN"}; + Configurable minTdcZn{"minTdcZn", -4.0, "minimum TDC for ZN"}; Configurable maxTdcZn{"maxTdcZn", 4.0, "maximum TDC for ZN"}; Configurable minTdcZp{"minTdcZp", -4.0, "minimum TDC for ZP"}; - Configurable maxTdcZp{"maxTdcZp", -4.0, "maximum TDC for ZP"}; - Configurable applyZdcCorrection{"applyZdcCorrection", false, "Apply ZP correction?"}; - Configurable zpaCoeff{"zpaCoeff", 0.021f, "Coefficient a in zpa correction"}; - Configurable zpcCoeff{"zpcCoeff", 0.021f, "Coefficient b in zpc correction"}; + Configurable maxTdcZp{"maxTdcZp", 4.0, "maximum TDC for ZP"}; Configurable posZcut{"posZcut", +10.0, "z-vertex position cut"}; Configurable posYcut{"posYcut", +10.0, "y-vertex position cut"}; Configurable posXcut{"posXcut", +10.0, "x-vertex position cut"}; @@ -94,6 +91,7 @@ struct FlowZdcTask { // event selection Configurable isNoCollInTimeRangeStrict{"isNoCollInTimeRangeStrict", true, "isNoCollInTimeRangeStrict?"}; Configurable isNoCollInTimeRangeStandard{"isNoCollInTimeRangeStandard", false, "isNoCollInTimeRangeStandard?"}; + Configurable isNoSameBunchPileup{"isNoSameBunchPileup", true, "isNoSameBunchPileup?"}; Configurable isNoCollInRofStrict{"isNoCollInRofStrict", true, "isNoCollInRofStrict?"}; Configurable isNoCollInRofStandard{"isNoCollInRofStandard", false, "isNoCollInRofStandard?"}; Configurable isNoHighMultCollInPrevRof{"isNoHighMultCollInPrevRof", true, "isNoHighMultCollInPrevRof?"}; @@ -302,10 +300,12 @@ struct FlowZdcTask { } histos.fill(HIST("hEventCounter"), EvCutLabel::SelEigth); - if (!col.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) { - return false; + if (isNoSameBunchPileup) { + if (!col.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) { + return false; + } + histos.fill(HIST("hEventCounter"), EvCutLabel::NoSameBunchPileup); } - histos.fill(HIST("hEventCounter"), EvCutLabel::NoSameBunchPileup); if (!col.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) { return false; @@ -497,14 +497,6 @@ struct FlowZdcTask { float commonSumZna = zdc.energyCommonZNA(); float commonSumZpc = zdc.energyCommonZPC(); float commonSumZpa = zdc.energyCommonZPA(); - if (applyZdcCorrection) { - const float a = zpaCoeff; - const float b = zpcCoeff; - zpA = zpA - a * znA; - commonSumZpa = commonSumZpa - a * commonSumZna; - zpC = zpC - b * znC; - commonSumZpc = commonSumZpc - b * commonSumZnc; - } float aZEM1{zdc.amplitudeZEM1()}; float aZEM2{zdc.amplitudeZEM2()}; float sumZEMs{aZEM1 + aZEM2}; From 6daa053a7b7eb51db538c981f0bc76dc21ccfbf8 Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Sun, 16 Aug 2026 22:21:38 -0500 Subject: [PATCH 2/9] clang format --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index 0e0d51ae8f0..cca658177b1 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -303,7 +303,7 @@ struct FlowZdcTask { if (isNoSameBunchPileup) { if (!col.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) { return false; - } + } histos.fill(HIST("hEventCounter"), EvCutLabel::NoSameBunchPileup); } From 87f124dab0b6d4321f87470451e90f243d6a6b2d Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 08:09:10 -0500 Subject: [PATCH 3/9] o2 code check error fix --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index cca658177b1..7bde368d6bc 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -52,7 +52,7 @@ using namespace o2::aod::mult; using namespace o2::constants::math; using namespace o2::aod::evsel; -#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable NAME{#NAME, (DEFAULT), (HELP)}; +#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable (NAME){#NAME, (DEFAULT), (HELP)}; struct FlowZdcTask { SliceCache cache; From c1764a38dddbdd6d54dda1da5fc148f371c3245d Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 08:28:14 -0500 Subject: [PATCH 4/9] pr formatting --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index 7bde368d6bc..94cbb880db3 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -52,7 +52,7 @@ using namespace o2::aod::mult; using namespace o2::constants::math; using namespace o2::aod::evsel; -#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable (NAME){#NAME, (DEFAULT), (HELP)}; +#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable(NAME){#NAME, (DEFAULT), (HELP)}; struct FlowZdcTask { SliceCache cache; From 802a82f4fe30c40b1349e2d759d5e0d0b8e2118a Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 08:41:18 -0500 Subject: [PATCH 5/9] megalinter error --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index 94cbb880db3..b2df9c9c876 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -52,7 +52,7 @@ using namespace o2::aod::mult; using namespace o2::constants::math; using namespace o2::aod::evsel; -#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable(NAME){#NAME, (DEFAULT), (HELP)}; +#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable(NAME){#NAME, (DEFAULT), (HELP)} struct FlowZdcTask { SliceCache cache; From febd961bc4b148adbe1d25164cf83a14a9c1c118 Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 08:50:23 -0500 Subject: [PATCH 6/9] clang format --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index b2df9c9c876..7ad19a0bf3a 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -52,12 +52,13 @@ using namespace o2::aod::mult; using namespace o2::constants::math; using namespace o2::aod::evsel; -#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable(NAME){#NAME, (DEFAULT), (HELP)} +#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) \ + Configurable(NAME) { #NAME, (DEFAULT), (HELP) } struct FlowZdcTask { SliceCache cache; - O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 10.0f, "Accepted z-vertex range") + O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 10.0f, "Accepted z-vertex range"); Configurable eventSelection{"eventSelection", 1, "event selection"}; Configurable maxZem{"maxZem", 3099.5, "Max ZEM signal"}; // for ZDC info and analysis From 032fc0ea0242cb99ca91889b02df4febf24f142a Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 10:09:01 -0500 Subject: [PATCH 7/9] clang format --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index 7ad19a0bf3a..e104e756e29 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -52,14 +52,9 @@ using namespace o2::aod::mult; using namespace o2::constants::math; using namespace o2::aod::evsel; -#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) \ - Configurable(NAME) { #NAME, (DEFAULT), (HELP) } - struct FlowZdcTask { SliceCache cache; - - O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 10.0f, "Accepted z-vertex range"); - Configurable eventSelection{"eventSelection", 1, "event selection"}; + Configurable cfgCutVertex{"cfgCutVertex", 10.0, "Accepted z-vertex range"}; Configurable maxZem{"maxZem", 3099.5, "Max ZEM signal"}; // for ZDC info and analysis Configurable maxZn{"maxZn", 125.5, "Max ZN signal"}; From cb2946ece0ca8def0df9ad86fe92bf4065f5d997 Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Mon, 17 Aug 2026 12:12:59 -0500 Subject: [PATCH 8/9] clang format --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index e104e756e29..c0b4a85096f 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -72,10 +72,10 @@ struct FlowZdcTask { Configurable maxNch{"maxNch", 2500, "Max Nch (|eta|<0.8)"}; Configurable nBinsTDC{"nBinsTDC", 150, "nbinsTDC"}; Configurable nBinsCent{"nBinsCent", 10, "nBinsCent"}; - Configurable minTdcZn{"minTdcZn", -4.0, "minimum TDC for ZN"}; - Configurable maxTdcZn{"maxTdcZn", 4.0, "maximum TDC for ZN"}; - Configurable minTdcZp{"minTdcZp", -4.0, "minimum TDC for ZP"}; - Configurable maxTdcZp{"maxTdcZp", 4.0, "maximum TDC for ZP"}; + Configurable minTdcZn{"minTdcZn", -2.0, "minimum TDC for ZN"}; + Configurable maxTdcZn{"maxTdcZn", 2.0, "maximum TDC for ZN"}; + Configurable minTdcZp{"minTdcZp", -2.0, "minimum TDC for ZP"}; + Configurable maxTdcZp{"maxTdcZp", 2.0, "maximum TDC for ZP"}; Configurable posZcut{"posZcut", +10.0, "z-vertex position cut"}; Configurable posYcut{"posYcut", +10.0, "y-vertex position cut"}; Configurable posXcut{"posXcut", +10.0, "x-vertex position cut"}; From 26e6731bdba51fb0271a62a64e7d8764003487a1 Mon Sep 17 00:00:00 2001 From: Sabrina Hernandez Date: Wed, 19 Aug 2026 13:47:06 -0500 Subject: [PATCH 9/9] o2 linter fix attempt --- PWGCF/Flow/Tasks/flowZdcTask.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcTask.cxx b/PWGCF/Flow/Tasks/flowZdcTask.cxx index c0b4a85096f..9402dbb8c01 100644 --- a/PWGCF/Flow/Tasks/flowZdcTask.cxx +++ b/PWGCF/Flow/Tasks/flowZdcTask.cxx @@ -60,7 +60,7 @@ struct FlowZdcTask { Configurable maxZn{"maxZn", 125.5, "Max ZN signal"}; Configurable maxZp{"maxZp", 125.5, "Max ZP signal"}; // configs for process QA - Configurable nBinsNch{"nBinsNch", 2501, "N bins Nch (|eta|<0.8)"}; + Configurable nBinsNch{"nBinsNch", 3501, "N bins Nch (|eta|<0.8)"}; Configurable nBinsAmpFT0{"nBinsAmpFT0", 100, "N bins FT0 amp"}; Configurable maxAmpFT0{"maxAmpFT0", 2500, "Max FT0 amp"}; Configurable maxAmpFT0M{"maxAmpFT0M", 2500, "Max FT0M amp"};