Add missing FDDMults in table names + add filling of multsGlobal table + remove superfluous table enabling checks

Author: romainschotter

Common/TableProducer/multCentTable.cxx

@@ -122,23 +122,17 @@ struct MultCentTable {
                   o2::aod::MFTTracks const& mfttracks,
                   soa::SmallGroups<aod::BestCollisionsFwd> 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<aod::McCollisionLabels, aod::Collisions>::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<aod::BCs, aod::BcSels, aod::Timestamps> const& bcs, aod::FT0s const&)
   {

Common/Tools/MultModule.h

@@ -48,6 +48,7 @@ static const std::vector<std::string> tableNames{
   "FV0Mults",
   "FV0AOuterMults",
   "FT0Mults",
+  "FDDMults",
   "ZDCMults",
   "TrackletMults",
   "TPCMults",
@@ -83,7 +84,7 @@ static const std::vector<std::string> tableNames{
   "BCCentFT0As",
   "BCCentFT0Cs"};
 
-static constexpr int nTablesConst = 35;
+static constexpr int nTablesConst = 36;
 
 static const std::vector<std::string> 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