From c0cba9f0fc66992c13aa2a93d4cdd166345a394f Mon Sep 17 00:00:00 2001 From: romainschotter Date: Tue, 10 Jun 2025 01:18:07 +0200 Subject: [PATCH] Add missing FDDMults in table names + add filling of multsGlobal table + remove superfluous table enabling checks --- Common/TableProducer/multCentTable.cxx | 16 +++++----------- Common/Tools/MultModule.h | 6 +++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Common/TableProducer/multCentTable.cxx b/Common/TableProducer/multCentTable.cxx index 16a55b82cd6..cfae9838fd8 100644 --- a/Common/TableProducer/multCentTable.cxx +++ b/Common/TableProducer/multCentTable.cxx @@ -122,23 +122,17 @@ struct MultCentTable { o2::aod::MFTTracks const& mfttracks, soa::SmallGroups const& retracks) { - if (opts.mEnabledTables[o2::common::multiplicity::kMFTMults]) { - // populates MFT information in the mults buffer (in addition to filling table) - module.collisionProcessMFT(collision, mfttracks, retracks, mults, products); - } + // populates MFT information in the mults buffer (in addition to filling table) + module.collisionProcessMFT(collision, mfttracks, retracks, mults, products); } void processMonteCarlo(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles) { - if (opts.mEnabledTables[o2::common::multiplicity::kMultMCExtras]) { - module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products); - } + module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products); } void processMonteCarlo2Mults(soa::Join::iterator const& collision) { - if (opts.mEnabledTables[o2::common::multiplicity::kMult2MCExtras]) { - // establish simple interlink for posterior analysis (derived data) - products.tableExtraMult2MCExtras(collision.mcCollisionId()); - } + // establish simple interlink for posterior analysis (derived data) + products.tableExtraMult2MCExtras(collision.mcCollisionId()); } void processCentrality(aod::Collisions const& collisions, soa::Join const& bcs, aod::FT0s const&) { diff --git a/Common/Tools/MultModule.h b/Common/Tools/MultModule.h index 292d4f8fd58..5b4fcab9091 100644 --- a/Common/Tools/MultModule.h +++ b/Common/Tools/MultModule.h @@ -48,6 +48,7 @@ static const std::vector tableNames{ "FV0Mults", "FV0AOuterMults", "FT0Mults", + "FDDMults", "ZDCMults", "TrackletMults", "TPCMults", @@ -83,7 +84,7 @@ static const std::vector tableNames{ "BCCentFT0As", "BCCentFT0Cs"}; -static constexpr int nTablesConst = 35; +static constexpr int nTablesConst = 36; static const std::vector parameterNames{"enable"}; static const int defaultParameters[nTablesConst][nParameters]{ @@ -121,6 +122,7 @@ static const int defaultParameters[nTablesConst][nParameters]{ {-1}, {-1}, {-1}, + {-1}, {-1}}; // table index : match order above @@ -674,6 +676,8 @@ class MultModule } } // end constexpr requires track selection stuff } + + cursors.multsGlobal(mults.multGlobalTracks, mults.multNbrContribsEta08GlobalTrackWoDCA, mults.multNbrContribsEta10GlobalTrackWoDCA, mults.multNbrContribsEta05GlobalTrackWoDCA); } // fill track counters at this stage if requested