From 87b1fe5b7c84023cfa97c8d61d81cf4492fb5930 Mon Sep 17 00:00:00 2001 From: David Dobrigkeit Chinellato Date: Sat, 4 Oct 2025 14:40:46 -0300 Subject: [PATCH 1/3] [Common] Add FT0C variant 2 --- Common/DataModel/Centrality.h | 2 ++ Common/Tools/Multiplicity/MultModule.h | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Common/DataModel/Centrality.h b/Common/DataModel/Centrality.h index 4713cceb697..97be46c17b1 100644 --- a/Common/DataModel/Centrality.h +++ b/Common/DataModel/Centrality.h @@ -31,6 +31,7 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); //! Run 3 cent. f DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float); //! Run 3 cent. from FT0A multiplicity DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); //! Run 3 cent. from FT0C multiplicity DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity +DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!) DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float); //! Run 3 cent. from FDDA+FDDC multiplicity DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float); //! Run 3 cent. from the number of tracks contributing to the DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float); //! Run 3 cent. from the number of tracks contributing to the PV @@ -59,6 +60,7 @@ DECLARE_SOA_TABLE(CentMFTs, "AOD", "CENTMFT", cent::CentMFT); //! Ru // Run 3 variant tables DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1 +DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 1 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only // Run 3 centrality per BC (joinable with BC) DECLARE_SOA_TABLE(BCCentFT0Ms, "AOD", "BCCENTFT0M", cent::CentFT0M, o2::soa::Marker<1>); //! Run 3 FT0M BC centrality table diff --git a/Common/Tools/Multiplicity/MultModule.h b/Common/Tools/Multiplicity/MultModule.h index d2faac6ca16..b5bb0ed08c2 100644 --- a/Common/Tools/Multiplicity/MultModule.h +++ b/Common/Tools/Multiplicity/MultModule.h @@ -90,6 +90,7 @@ static const std::vector tableNames{ "CentFT0As", "CentFT0Cs", "CentFT0CVariant1s", + "CentFT0CVariant2s", "CentFDDMs", "CentNTPVs", "CentNGlobals", @@ -98,7 +99,7 @@ static const std::vector tableNames{ "BCCentFT0As", "BCCentFT0Cs"}; -static constexpr int nTablesConst = 38; +static constexpr int nTablesConst = 39; static const std::vector parameterNames{"enable"}; static const int defaultParameters[nTablesConst][nParameters]{ @@ -139,6 +140,7 @@ static const int defaultParameters[nTablesConst][nParameters]{ {-1}, {-1}, {-1}, + {-1}, {-1}}; // table index : match order above @@ -175,6 +177,7 @@ enum tableIndex { kFV0Mults, // standard kCentFT0As, // standard Run 3 kCentFT0Cs, // standard Run 3 kCentFT0CVariant1s, // standard Run 3 + kCentFT0CVariant2s, // standard Run 3 kCentFDDMs, // standard Run 3 kCentNTPVs, // standard Run 3 kCentNGlobals, // requires track selection task @@ -221,6 +224,7 @@ struct products : o2::framework::ProducesGroup { o2::framework::Produces centFT0A; o2::framework::Produces centFT0C; o2::framework::Produces centFT0CVariant1; + o2::framework::Produces centFT0CVariant2; o2::framework::Produces centFDDM; o2::framework::Produces centNTPV; o2::framework::Produces centNGlobals; @@ -432,6 +436,7 @@ class MultModule CalibrationInfo ft0aInfo = CalibrationInfo("FT0A"); CalibrationInfo ft0cInfo = CalibrationInfo("FT0C"); CalibrationInfo ft0cVariant1Info = CalibrationInfo("FT0Cvar1"); + CalibrationInfo ft0cVariant2Info = CalibrationInfo("FT0Cvar2"); CalibrationInfo fddmInfo = CalibrationInfo("FDD"); CalibrationInfo ntpvInfo = CalibrationInfo("NTracksPV"); CalibrationInfo nGlobalInfo = CalibrationInfo("NGlobal"); @@ -1225,7 +1230,9 @@ class MultModule getccdb(ft0cInfo, internalOpts.generatorName); if (internalOpts.mEnabledTables[kCentFT0CVariant1s]) getccdb(ft0cVariant1Info, internalOpts.generatorName); - if (internalOpts.mEnabledTables[kCentFDDMs]) + if (internalOpts.mEnabledTables[kCentFT0CVariant2s]) + getccdb(ft0cVariant2Info, internalOpts.generatorName); + if (internalOpts.mEnabledTables[kCentFDDMs]) getccdb(fddmInfo, internalOpts.generatorName); if (internalOpts.mEnabledTables[kCentNTPVs]) getccdb(ntpvInfo, internalOpts.generatorName); @@ -1249,7 +1256,9 @@ class MultModule if ( internalOpts.mEnabledTables[kCentFV0As] || internalOpts.mEnabledTables[kCentFT0Ms] || internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kCentFT0Cs] || - internalOpts.mEnabledTables[kCentFT0CVariant1s] || internalOpts.mEnabledTables[kCentFDDMs] || + internalOpts.mEnabledTables[kCentFT0CVariant1s] || + internalOpts.mEnabledTables[kCentFT0CVariant2s] || + internalOpts.mEnabledTables[kCentFDDMs] || internalOpts.mEnabledTables[kCentNTPVs] || internalOpts.mEnabledTables[kCentNGlobals] || internalOpts.mEnabledTables[kCentMFTs] || internalOpts.mEnabledTables[kBCCentFT0Ms] || internalOpts.mEnabledTables[kBCCentFT0As] || internalOpts.mEnabledTables[kBCCentFT0Cs]) { @@ -1304,6 +1313,8 @@ class MultModule populateTable(cursors.centFT0C, ft0cInfo, mults[iEv].multFT0CZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentFT0CVariant1s]) populateTable(cursors.centFT0CVariant1, ft0cVariant1Info, mults[iEv].multFT0CZeq, isInelGt0); + if (internalOpts.mEnabledTables[kCentFT0CVariant2s]) + populateTable(cursors.centFT0CVariant2, ft0cVariant2Info, mults[iEv].multFT0CZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentFDDMs]) populateTable(cursors.centFDDM, fddmInfo, mults[iEv].multFDDAZeq + mults[iEv].multFDDCZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentNTPVs]) From 476d7e86fc5c7fa618761ced488ad38bf40daeee Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Sun, 5 Oct 2025 10:35:35 +0200 Subject: [PATCH 2/3] Please consider the following formatting changes (#486) --- Common/Tools/Multiplicity/MultModule.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/Tools/Multiplicity/MultModule.h b/Common/Tools/Multiplicity/MultModule.h index b5bb0ed08c2..e1ecc71f766 100644 --- a/Common/Tools/Multiplicity/MultModule.h +++ b/Common/Tools/Multiplicity/MultModule.h @@ -1231,8 +1231,8 @@ class MultModule if (internalOpts.mEnabledTables[kCentFT0CVariant1s]) getccdb(ft0cVariant1Info, internalOpts.generatorName); if (internalOpts.mEnabledTables[kCentFT0CVariant2s]) - getccdb(ft0cVariant2Info, internalOpts.generatorName); - if (internalOpts.mEnabledTables[kCentFDDMs]) + getccdb(ft0cVariant2Info, internalOpts.generatorName); + if (internalOpts.mEnabledTables[kCentFDDMs]) getccdb(fddmInfo, internalOpts.generatorName); if (internalOpts.mEnabledTables[kCentNTPVs]) getccdb(ntpvInfo, internalOpts.generatorName); @@ -1256,8 +1256,8 @@ class MultModule if ( internalOpts.mEnabledTables[kCentFV0As] || internalOpts.mEnabledTables[kCentFT0Ms] || internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kCentFT0Cs] || - internalOpts.mEnabledTables[kCentFT0CVariant1s] || - internalOpts.mEnabledTables[kCentFT0CVariant2s] || + internalOpts.mEnabledTables[kCentFT0CVariant1s] || + internalOpts.mEnabledTables[kCentFT0CVariant2s] || internalOpts.mEnabledTables[kCentFDDMs] || internalOpts.mEnabledTables[kCentNTPVs] || internalOpts.mEnabledTables[kCentNGlobals] || internalOpts.mEnabledTables[kCentMFTs] || internalOpts.mEnabledTables[kBCCentFT0Ms] || @@ -1314,7 +1314,7 @@ class MultModule if (internalOpts.mEnabledTables[kCentFT0CVariant1s]) populateTable(cursors.centFT0CVariant1, ft0cVariant1Info, mults[iEv].multFT0CZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentFT0CVariant2s]) - populateTable(cursors.centFT0CVariant2, ft0cVariant2Info, mults[iEv].multFT0CZeq, isInelGt0); + populateTable(cursors.centFT0CVariant2, ft0cVariant2Info, mults[iEv].multFT0CZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentFDDMs]) populateTable(cursors.centFDDM, fddmInfo, mults[iEv].multFDDAZeq + mults[iEv].multFDDCZeq, isInelGt0); if (internalOpts.mEnabledTables[kCentNTPVs]) From f72d594ee28e055c2839efe2dd6206e7d2a0c7ae Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 7 Oct 2025 14:54:30 +0200 Subject: [PATCH 3/3] Update MultModule.h --- Common/Tools/Multiplicity/MultModule.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Tools/Multiplicity/MultModule.h b/Common/Tools/Multiplicity/MultModule.h index e1ecc71f766..6df1bd366de 100644 --- a/Common/Tools/Multiplicity/MultModule.h +++ b/Common/Tools/Multiplicity/MultModule.h @@ -1191,6 +1191,7 @@ class MultModule ft0aInfo.mCalibrationStored = false; ft0cInfo.mCalibrationStored = false; ft0cVariant1Info.mCalibrationStored = false; + ft0cVariant2Info.mCalibrationStored = false; fddmInfo.mCalibrationStored = false; ntpvInfo.mCalibrationStored = false; nGlobalInfo.mCalibrationStored = false;