From d2fca29464b8a87eab4e1826b4d8aea5985213bd Mon Sep 17 00:00:00 2001 From: Chiara Oppedisano Date: Tue, 28 Oct 2025 18:40:11 +0100 Subject: [PATCH 1/4] Fixing issue with PWGLF --- PWGLF/TableProducer/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PWGLF/TableProducer/CMakeLists.txt b/PWGLF/TableProducer/CMakeLists.txt index ec21b553563..2573853af6d 100644 --- a/PWGLF/TableProducer/CMakeLists.txt +++ b/PWGLF/TableProducer/CMakeLists.txt @@ -9,9 +9,8 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -add_subdirectory(QC) add_subdirectory(Common) add_subdirectory(Nuspex) add_subdirectory(Strangeness) -add_subdirectory(Resonances) +add_subdirectory(Resonances) \ No newline at end of file From ade6071c5fffd2fcee5fbe302ba46c8a89bf3058 Mon Sep 17 00:00:00 2001 From: Chiara Oppedisano Date: Thu, 30 Oct 2025 10:40:51 +0100 Subject: [PATCH 2/4] Revert "Fixing issue with PWGLF" This reverts commit 0bd9685d4e2f5e96a5572871507bba95e3010464. --- PWGLF/TableProducer/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PWGLF/TableProducer/CMakeLists.txt b/PWGLF/TableProducer/CMakeLists.txt index 2573853af6d..ec21b553563 100644 --- a/PWGLF/TableProducer/CMakeLists.txt +++ b/PWGLF/TableProducer/CMakeLists.txt @@ -9,8 +9,9 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. +add_subdirectory(QC) add_subdirectory(Common) add_subdirectory(Nuspex) add_subdirectory(Strangeness) -add_subdirectory(Resonances) \ No newline at end of file +add_subdirectory(Resonances) From 7a58d98972caaaa7c29c706ec5589e58f85f4eda Mon Sep 17 00:00:00 2001 From: Chiara Oppedisano Date: Wed, 5 Nov 2025 15:24:19 +0100 Subject: [PATCH 3/4] Adding ZP PMC ADC values to the new table --- Common/DataModel/ZDCLightIons.h | 2 ++ Common/TableProducer/zdcTaskLightIons.cxx | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Common/DataModel/ZDCLightIons.h b/Common/DataModel/ZDCLightIons.h index b2faa13ba9d..cba233e146b 100644 --- a/Common/DataModel/ZDCLightIons.h +++ b/Common/DataModel/ZDCLightIons.h @@ -77,8 +77,10 @@ DECLARE_SOA_TABLE(ZDCLightIons, "AOD", "ZDCTABLELIGHTIONS", zdclightions::ZncPm4, zdclightions::ZpaTdc, zdclightions::ZpaAmpl, + zdclightions::ZpaPmc, zdclightions::ZpcTdc, zdclightions::ZpcAmpl, + zdclightions::ZpcPmc, zdclightions::Zem1Tdc, zdclightions::Zem1Ampl, zdclightions::Zem2Tdc, diff --git a/Common/TableProducer/zdcTaskLightIons.cxx b/Common/TableProducer/zdcTaskLightIons.cxx index 455ae737086..6b678678a6a 100644 --- a/Common/TableProducer/zdcTaskLightIons.cxx +++ b/Common/TableProducer/zdcTaskLightIons.cxx @@ -173,6 +173,8 @@ struct ZdcTaskLightIons { // double pmcZNA = bc.zdc().energyCommonZNA(); double pmcZNC = bc.zdc().energyCommonZNC(); + double pmcZPA = bc.zdc().energyCommonZPA(); + double pmcZPC = bc.zdc().energyCommonZPC(); double pmqZNC[4] = { 0, 0, @@ -213,7 +215,9 @@ struct ZdcTaskLightIons { zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], - tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2, + tdcZPA, zpa, pmcZPA, + tdcZPC, zpc, pmcZPC, + tdcZEM1, zem1, tdcZEM2, zem2, -1, -1, -1, -1., -1, -1, -1, @@ -276,6 +280,8 @@ struct ZdcTaskLightIons { // double pmcZNA = zdc.energyCommonZNA(); double pmcZNC = zdc.energyCommonZNC(); + double pmcZPA = zdc.energyCommonZPA(); + double pmcZPC = zdc.energyCommonZPC(); double pmqZNC[4] = { 0, 0, @@ -316,12 +322,15 @@ struct ZdcTaskLightIons { zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], - tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2, + tdcZPA, zpa, pmcZPA, + tdcZPC, zpc, pmcZPC, + tdcZEM1, zem1, tdcZEM2, zem2, multFT0A, multFT0C, multV0A, zv, centralityFT0C, centralityFT0A, centralityFT0M, foundBC.timestamp(), evSelection); + } } } From a6a4b2e3ce5c0ee1f484f8b73b058c96e9875891 Mon Sep 17 00:00:00 2001 From: Chiara Oppedisano Date: Wed, 5 Nov 2025 15:53:37 +0100 Subject: [PATCH 4/4] Fixing coding conventions --- Common/TableProducer/zdcTaskLightIons.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/TableProducer/zdcTaskLightIons.cxx b/Common/TableProducer/zdcTaskLightIons.cxx index 6b678678a6a..64b9cbeb7de 100644 --- a/Common/TableProducer/zdcTaskLightIons.cxx +++ b/Common/TableProducer/zdcTaskLightIons.cxx @@ -215,7 +215,7 @@ struct ZdcTaskLightIons { zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], - tdcZPA, zpa, pmcZPA, + tdcZPA, zpa, pmcZPA, tdcZPC, zpc, pmcZPC, tdcZEM1, zem1, tdcZEM2, zem2, -1, -1, -1, @@ -322,7 +322,7 @@ struct ZdcTaskLightIons { zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], - tdcZPA, zpa, pmcZPA, + tdcZPA, zpa, pmcZPA, tdcZPC, zpc, pmcZPC, tdcZEM1, zem1, tdcZEM2, zem2, multFT0A, multFT0C, multV0A, @@ -330,7 +330,6 @@ struct ZdcTaskLightIons { centralityFT0C, centralityFT0A, centralityFT0M, foundBC.timestamp(), evSelection); - } } }