From 79ab2ceadad1fd5223f0443599f373d544fb9d31 Mon Sep 17 00:00:00 2001 From: kegangxiong Date: Thu, 7 May 2026 16:17:54 +0800 Subject: [PATCH 1/4] save the zdc tree --- PWGCF/Flow/Tasks/flowZdcEnergy.cxx | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx index 742fd5248c0..0d728623c14 100644 --- a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx +++ b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx @@ -42,6 +42,36 @@ using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; +namespace o2::aod +{ + namespace zdctree + { + DECLARE_SOA_COLUMN(ZNAC, znac, float); + DECLARE_SOA_COLUMN(ZNA1, zna1, float); + DECLARE_SOA_COLUMN(ZNA2, zna2, float); + DECLARE_SOA_COLUMN(ZNA3, zna3, float); + DECLARE_SOA_COLUMN(ZNA4, zna4, float); + DECLARE_SOA_COLUMN(ZNCC, zncc, float); + DECLARE_SOA_COLUMN(ZNC1, znc1, float); + DECLARE_SOA_COLUMN(ZNC2, znc2, float); + DECLARE_SOA_COLUMN(ZNC3, znc3, float); + DECLARE_SOA_COLUMN(ZNC4, znc4, float); + DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float); + } + DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE", + zdctree::ZNAC, + zdctree::ZNA1, + zdctree::ZNA2, + zdctree::ZNA3, + zdctree::ZNA4, + zdctree::ZNCC, + zdctree::ZNC1, + zdctree::ZNC2, + zdctree::ZNC3, + zdctree::ZNC4, + zdctree::Multiplicity); +} + #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable NAME{#NAME, DEFAULT, HELP}; struct FlowZdcEnergy { @@ -73,6 +103,7 @@ struct FlowZdcEnergy { Service ccdb; HistogramRegistry registry{"registry"}; + Produces zdcTree; Filter trackFilter = nabs(aod::track::eta) < cfgEtaMax && aod::track::pt > cfgPtMin&& aod::track::pt < cfgPtMax&& nabs(aod::track::dcaXY) < cfgDcaXYMax&& nabs(aod::track::dcaZ) < cfgDcaZMax; using UsedTracks = soa::Filtered>; @@ -204,6 +235,18 @@ struct FlowZdcEnergy { const float energySectorZNC3 = zdc.energySectorZNC()[2]; const float energySectorZNC4 = zdc.energySectorZNC()[3]; + zdcTree(energyCommonZNA, + energySectorZNA1, + energySectorZNA2, + energySectorZNA3, + energySectorZNA4, + energyCommonZNC, + energySectorZNC1, + energySectorZNC2, + energySectorZNC3, + energySectorZNC4, + multiTPC); + const float sumEnergyZNA = energySectorZNA1 + energySectorZNA2 + energySectorZNA3 + energySectorZNA4; const float sumEnergyZNC = energySectorZNC1 + energySectorZNC2 + energySectorZNC3 + energySectorZNC4; From 7458f9388da1c1819d86cf4c4f5142acb5be46f1 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 7 May 2026 08:19:50 +0000 Subject: [PATCH 2/4] Please consider the following formatting changes --- PWGCF/Flow/Tasks/flowZdcEnergy.cxx | 74 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx index 0d728623c14..28e0e8bde7b 100644 --- a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx +++ b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx @@ -44,33 +44,33 @@ using namespace o2::framework::expressions; namespace o2::aod { - namespace zdctree - { - DECLARE_SOA_COLUMN(ZNAC, znac, float); - DECLARE_SOA_COLUMN(ZNA1, zna1, float); - DECLARE_SOA_COLUMN(ZNA2, zna2, float); - DECLARE_SOA_COLUMN(ZNA3, zna3, float); - DECLARE_SOA_COLUMN(ZNA4, zna4, float); - DECLARE_SOA_COLUMN(ZNCC, zncc, float); - DECLARE_SOA_COLUMN(ZNC1, znc1, float); - DECLARE_SOA_COLUMN(ZNC2, znc2, float); - DECLARE_SOA_COLUMN(ZNC3, znc3, float); - DECLARE_SOA_COLUMN(ZNC4, znc4, float); - DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float); - } - DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE", - zdctree::ZNAC, - zdctree::ZNA1, - zdctree::ZNA2, - zdctree::ZNA3, - zdctree::ZNA4, - zdctree::ZNCC, - zdctree::ZNC1, - zdctree::ZNC2, - zdctree::ZNC3, - zdctree::ZNC4, - zdctree::Multiplicity); -} +namespace zdctree +{ +DECLARE_SOA_COLUMN(ZNAC, znac, float); +DECLARE_SOA_COLUMN(ZNA1, zna1, float); +DECLARE_SOA_COLUMN(ZNA2, zna2, float); +DECLARE_SOA_COLUMN(ZNA3, zna3, float); +DECLARE_SOA_COLUMN(ZNA4, zna4, float); +DECLARE_SOA_COLUMN(ZNCC, zncc, float); +DECLARE_SOA_COLUMN(ZNC1, znc1, float); +DECLARE_SOA_COLUMN(ZNC2, znc2, float); +DECLARE_SOA_COLUMN(ZNC3, znc3, float); +DECLARE_SOA_COLUMN(ZNC4, znc4, float); +DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float); +} // namespace zdctree +DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE", + zdctree::ZNAC, + zdctree::ZNA1, + zdctree::ZNA2, + zdctree::ZNA3, + zdctree::ZNA4, + zdctree::ZNCC, + zdctree::ZNC1, + zdctree::ZNC2, + zdctree::ZNC3, + zdctree::ZNC4, + zdctree::Multiplicity); +} // namespace o2::aod #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable NAME{#NAME, DEFAULT, HELP}; @@ -236,16 +236,16 @@ struct FlowZdcEnergy { const float energySectorZNC4 = zdc.energySectorZNC()[3]; zdcTree(energyCommonZNA, - energySectorZNA1, - energySectorZNA2, - energySectorZNA3, - energySectorZNA4, - energyCommonZNC, - energySectorZNC1, - energySectorZNC2, - energySectorZNC3, - energySectorZNC4, - multiTPC); + energySectorZNA1, + energySectorZNA2, + energySectorZNA3, + energySectorZNA4, + energyCommonZNC, + energySectorZNC1, + energySectorZNC2, + energySectorZNC3, + energySectorZNC4, + multiTPC); const float sumEnergyZNA = energySectorZNA1 + energySectorZNA2 + energySectorZNA3 + energySectorZNA4; const float sumEnergyZNC = energySectorZNC1 + energySectorZNC2 + energySectorZNC3 + energySectorZNC4; From fab5d053e74abed2860c4366297cdf77ff5ea27a Mon Sep 17 00:00:00 2001 From: kegangxiong Date: Thu, 7 May 2026 16:58:34 +0800 Subject: [PATCH 3/4] Fix o2-linter error --- PWGCF/Flow/Tasks/flowZdcEnergy.cxx | 41 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx index 28e0e8bde7b..2c9bb675741 100644 --- a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx +++ b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx @@ -42,33 +42,34 @@ using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; + namespace o2::aod { namespace zdctree { -DECLARE_SOA_COLUMN(ZNAC, znac, float); -DECLARE_SOA_COLUMN(ZNA1, zna1, float); -DECLARE_SOA_COLUMN(ZNA2, zna2, float); -DECLARE_SOA_COLUMN(ZNA3, zna3, float); -DECLARE_SOA_COLUMN(ZNA4, zna4, float); -DECLARE_SOA_COLUMN(ZNCC, zncc, float); -DECLARE_SOA_COLUMN(ZNC1, znc1, float); -DECLARE_SOA_COLUMN(ZNC2, znc2, float); -DECLARE_SOA_COLUMN(ZNC3, znc3, float); -DECLARE_SOA_COLUMN(ZNC4, znc4, float); +DECLARE_SOA_COLUMN(Znac, znac, float); +DECLARE_SOA_COLUMN(Zna1, zna1, float); +DECLARE_SOA_COLUMN(Zna2, zna2, float); +DECLARE_SOA_COLUMN(Zna3, zna3, float); +DECLARE_SOA_COLUMN(Zna4, zna4, float); +DECLARE_SOA_COLUMN(Zncc, zncc, float); +DECLARE_SOA_COLUMN(Znc1, znc1, float); +DECLARE_SOA_COLUMN(Znc2, znc2, float); +DECLARE_SOA_COLUMN(Znc3, znc3, float); +DECLARE_SOA_COLUMN(Znc4, znc4, float); DECLARE_SOA_COLUMN(Multiplicity, multiplicity, float); } // namespace zdctree DECLARE_SOA_TABLE(ZdcTree, "AOD", "ZDCTREE", - zdctree::ZNAC, - zdctree::ZNA1, - zdctree::ZNA2, - zdctree::ZNA3, - zdctree::ZNA4, - zdctree::ZNCC, - zdctree::ZNC1, - zdctree::ZNC2, - zdctree::ZNC3, - zdctree::ZNC4, + zdctree::Znac, + zdctree::Zna1, + zdctree::Zna2, + zdctree::Zna3, + zdctree::Zna4, + zdctree::Zncc, + zdctree::Znc1, + zdctree::Znc2, + zdctree::Znc3, + zdctree::Znc4, zdctree::Multiplicity); } // namespace o2::aod From 533d8fc13cf3822741b83cb32dd69eb42f75d5bd Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 7 May 2026 09:02:15 +0000 Subject: [PATCH 4/4] Please consider the following formatting changes --- PWGCF/Flow/Tasks/flowZdcEnergy.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx index 2c9bb675741..e1366124622 100644 --- a/PWGCF/Flow/Tasks/flowZdcEnergy.cxx +++ b/PWGCF/Flow/Tasks/flowZdcEnergy.cxx @@ -42,7 +42,6 @@ using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; - namespace o2::aod { namespace zdctree