Merge branch 'AliceO2Group:master' into main

Author: Yunseul-Bae

CODEOWNERS

@@ -50,6 +50,7 @@
 /PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
 /PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
 /PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
+/PWGLF/Utils @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
 
 # PWG-MM
 /PWGMM      @alibuild @sustripathy @skundu692 @aalkin @jgcn

Common/Core/RecoDecay.h

@@ -732,7 +732,7 @@ struct RecoDecay {
         if (!arrDaughters[iProng].has_mcParticle()) {
           return -1;
         }
-        auto particleI = arrDaughters[iProng].mcParticle();                                // ith daughter particle
+        auto particleI = arrDaughters[iProng].template mcParticle_as<T>();                 // ith daughter particle
         if (std::abs(particleI.getGenStatusCode()) == StatusCodeAfterFlavourOscillation) { // oscillation decay product spotted
           coefFlavourOscillation = -1;                                                     // select the sign of the mother after oscillation (and not before)
           break;
@@ -744,7 +744,7 @@ struct RecoDecay {
       if (!arrDaughters[iProng].has_mcParticle()) {
         return -1;
       }
-      auto particleI = arrDaughters[iProng].mcParticle(); // ith daughter particle
+      auto particleI = arrDaughters[iProng].template mcParticle_as<T>(); // ith daughter particle
       if constexpr (acceptTrackDecay) {
         // Replace the MC particle associated with the prong by its mother for π → μ and K → π.
         auto motherI = particleI.template mothers_first_as<T>();

Common/Core/TableHelper.cxx

@@ -17,14 +17,14 @@
 
 #include "Common/Core/TableHelper.h"
 
-#include <string>
-
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+#include <string>
+
 /// Function to print the table required in the full workflow
 /// @param initContext initContext of the init function
-void printTablesInWorkflow(o2::framework::InitContext& initContext)
+void o2::common::core::printTablesInWorkflow(o2::framework::InitContext& initContext)
 {
   auto& workflows = initContext.services().get<o2::framework::RunningWorkflowInfo const>();
   for (auto const& device : workflows.devices) {
@@ -37,7 +37,7 @@ void printTablesInWorkflow(o2::framework::InitContext& initContext)
 /// Function to check if a table is required in a workflow
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
-bool isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const std::string& table)
+bool o2::common::core::isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const std::string& table)
 {
   LOG(debug) << "Checking if table " << table << " is needed";
   bool tableNeeded = false;
@@ -57,7 +57,7 @@ bool isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const st
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
 /// @param flag bool value of flag to set, if the given value is true it will be kept, disregarding the table usage in the workflow.
-void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, bool& flag)
+void o2::common::core::enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, bool& flag)
 {
   if (flag) {
     LOG(info) << "Table enabled: " + table;
@@ -75,7 +75,7 @@ void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const st
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
 /// @param flag int value of flag to set, only if initially set to -1. Initial values of 0 or 1 will be kept disregarding the table usage in the workflow.
-void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, int& flag)
+void o2::common::core::enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, int& flag)
 {
   if (flag > 0) {
     flag = 1;

Common/Core/TableHelper.h

@@ -24,6 +24,9 @@
 
 #include <string>
 
+namespace o2::common::core
+{
+
 /// Function to print the table required in the full workflow
 /// @param initContext initContext of the init function
 void printTablesInWorkflow(o2::framework::InitContext& initContext);
@@ -109,4 +112,11 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
   return getTaskOptionValue(initContext, taskName, configurable.name, configurable.value, verbose);
 }
 
+} // namespace o2::common::core
+
+using o2::common::core::enableFlagIfTableRequired;
+using o2::common::core::getTaskOptionValue;
+using o2::common::core::isTableRequiredInWorkflow;
+using o2::common::core::printTablesInWorkflow;
+
 #endif // COMMON_CORE_TABLEHELPER_H_

Common/Tasks/centralityStudy.cxx

@@ -327,7 +327,7 @@ struct centralityStudy {
     histos.fill(HIST("hCollisionSelection"), 15 /* pass em/upc rejection */);
 
     // if we got here, we also finally fill the FT0C histogram, please
-    histos.fill(HIST("hNPVContributors"), collision.multPVTotalContributors());
+    histos.fill(HIST("hNPVContributors"), collision.multNTracksPV());
     histos.fill(HIST("hFT0C_Collisions"), collision.multFT0C() * scaleSignalFT0C);
     histos.fill(HIST("hFT0M_Collisions"), (collision.multFT0A() + collision.multFT0C()) * scaleSignalFT0M);
     histos.fill(HIST("hFV0A_Collisions"), collision.multFV0A() * scaleSignalFV0A);