Merge branch 'master' into master

Author: smaff92

ALICE3/Core/FastTracker.cxx

@@ -516,7 +516,7 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   for (int ii = 0; ii < o2::track::kCovMatSize; ii++)
     covMat[ii] = outputTrack.getCov()[ii];
   TMatrixDSym m(5);
-  float fcovm[5][5];
+  double fcovm[5][5]; // double precision is needed for regularisation
 
   for (int ii = 0, k = 0; ii < 5; ++ii) {
     for (int j = 0; j < ii + 1; ++j, ++k) {

ALICE3/DataModel/OTFMulticharm.h

@@ -116,24 +116,24 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
                   otfmulticharm::Eta,
 
                   otfmulticharm::XiDCAxy,
-                  otfmulticharm::XicDCAxy,
-                  otfmulticharm::XiccDCAxy,
                   otfmulticharm::XiDCAz,
+                  otfmulticharm::XicDCAxy,
                   otfmulticharm::XicDCAz,
+                  otfmulticharm::XiccDCAxy,
                   otfmulticharm::XiccDCAz,
 
                   otfmulticharm::PiFromXiDCAxy,
-                  otfmulticharm::PiFromLaDCAxy,
-                  otfmulticharm::PrFromLaDCAxy,
                   otfmulticharm::PiFromXiDCAz,
+                  otfmulticharm::PiFromLaDCAxy,
                   otfmulticharm::PiFromLaDCAz,
+                  otfmulticharm::PrFromLaDCAxy,
                   otfmulticharm::PrFromLaDCAz,
 
                   otfmulticharm::Pi1cDCAxy,
-                  otfmulticharm::Pi2cDCAxy,
-                  otfmulticharm::PiccDCAxy,
                   otfmulticharm::Pi1cDCAz,
+                  otfmulticharm::Pi2cDCAxy,
                   otfmulticharm::Pi2cDCAz,
+                  otfmulticharm::PiccDCAxy,
                   otfmulticharm::PiccDCAz,
 
                   otfmulticharm::XicDecayRadius2D,

ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

@@ -745,10 +745,15 @@ struct OnTheFlyRichPid {
     }
 
     for (const auto& track : tracks) {
+
+      float nSigmaBarrelRich[5] = {error_value, error_value, error_value, error_value, error_value};
+
       // first step: find precise arrival time (if any)
       // --- convert track into perfect track
-      if (!track.has_mcParticle()) // should always be OK but check please
+      if (!track.has_mcParticle()) { // should always be OK but check please
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
+      }
 
       auto mcParticle = track.mcParticle();
       o2::track::TrackParCov o2track = o2::upgrade::convertMCParticleToO2Track(mcParticle, pdg);
@@ -761,12 +766,14 @@ struct OnTheFlyRichPid {
       // get particle to calculate Cherenkov angle and resolution
       auto pdgInfo = pdg->GetParticle(mcParticle.pdgCode());
       if (pdgInfo == nullptr) {
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
       }
 
       // find track bRICH sector
       int i_sector = findSector(o2track.getEta());
       if (i_sector < 0) {
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
       }
 
@@ -794,12 +801,12 @@ struct OnTheFlyRichPid {
       }
 
       // Straight to Nsigma
-      float deltaThetaBarrelRich[5], nSigmaBarrelRich[5];
+      float deltaThetaBarrelRich[5]; //, nSigmaBarrelRich[5];
       int lpdg_array[5] = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton};
       float masses[5];
 
       for (int ii = 0; ii < 5; ii++) {
-        nSigmaBarrelRich[ii] = error_value;
+        // nSigmaBarrelRich[ii] = error_value;
 
         auto pdgInfoThis = pdg->GetParticle(lpdg_array[ii]);
         masses[ii] = pdgInfoThis->Mass();

CODEOWNERS

@@ -36,7 +36,7 @@
 /PWGCF/Tasks         @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye @glromane
 /PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93
 /PWGEM @alibuild @feisenhu @dsekihat @ivorobye
-/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
+/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
 /PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel
 # PWG-LF
@@ -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/CollisionTypeHelper.cxx

@@ -10,17 +10,20 @@
 // or submit itself to any jurisdiction.
 
 ///
-/// \file   CollisionTypeHelper.h
+/// \file   CollisionTypeHelper.cxx
 /// \author Nicolò Jacazio nicolo.jacazio@cern.ch
 /// \brief  Utility to handle the collision type from the GRP information
 ///
 
 #include "Common/Core/CollisionTypeHelper.h"
+
+#include "DataFormatsParameters/GRPLHCIFData.h"
+
 #include <fairlogger/Logger.h>
+
 #include <string>
-#include "DataFormatsParameters/GRPLHCIFData.h"
 
-std::string CollisionSystemType::getCollisionSystemName(collType collSys)
+std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collType collSys)
 {
   switch (collSys) {
     case kCollSyspp:
@@ -31,17 +34,26 @@ std::string CollisionSystemType::getCollisionSystemName(collType collSys)
       return "XeXe";
     case kCollSyspPb:
       return "pPb";
+    case kCollSysOO:
+      return "OO";
+    case kCollSyspO:
+      return "pO";
+    case kCollSysNeNe:
+      return "NeNe";
+    case kCollSysUndef:
+      return "Undefined";
     default:
+      LOG(warning) << "Undefined collision system type: " << collSys;
       return "Undefined";
   }
 }
 
-int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
+int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
 {
-  const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
-  const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);
-  LOG(debug) << "Collision system: " << ZBeamA << " * " << ZBeamC << " detected";
-  switch (ZBeamA * ZBeamC) {
+  const int zBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
+  const int zBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);
+  LOG(debug) << "Collision system Z: " << zBeamA << " * " << zBeamC << " detected = " << zBeamA * zBeamC;
+  switch (zBeamA * zBeamC) {
     case 1: // pp 1*1
       return kCollSyspp;
     case 6724: // Pb-Pb 82*82
@@ -50,8 +62,14 @@ int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* g
       return kCollSysXeXe;
     case 82: // p-Pb 82*1
       return kCollSyspPb;
+    case 64: // O-O 8*8
+      return kCollSysOO;
+    case 8: // p-O 8*1
+      return kCollSyspO;
+    case 100: // Ne-Ne 10*10
+      return kCollSysNeNe;
     default:
-      LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with BeamA = " << ZBeamA << " and BeamC = " << ZBeamC;
+      LOG(fatal) << "Undefined collision system in getCollisionTypeFromGrp with Z of BeamA = " << zBeamA << " and Z of BeamC = " << zBeamC;
       return kCollSysUndef;
   }
   return kCollSysUndef;

Common/Core/CollisionTypeHelper.h

@@ -18,9 +18,12 @@
 #ifndef COMMON_CORE_COLLISIONTYPEHELPER_H_
 #define COMMON_CORE_COLLISIONTYPEHELPER_H_
 
-#include <string>
 #include "DataFormatsParameters/GRPLHCIFData.h"
 
+#include <string>
+
+namespace o2::common::core
+{
 // Container for the collision system type
 struct CollisionSystemType {
   // Enum type for the collision system
@@ -31,11 +34,18 @@ struct CollisionSystemType {
   static constexpr collType kCollSysPbPb = 1;   // PbPb
   static constexpr collType kCollSysXeXe = 2;   // XeXe
   static constexpr collType kCollSyspPb = 3;    // pPb
-  static constexpr collType kNCollSys = 4;      // Number of collision systems
+  static constexpr collType kCollSysOO = 4;     // OO (Oxygen-Oxygen)
+  static constexpr collType kCollSyspO = 5;     // pO (proton-Oxygen)
+  static constexpr collType kCollSysNeNe = 6;   // NeNe (Neon-Neon)
+  static constexpr collType kNCollSys = 7;      // Number of collision systems
 
   static std::string getCollisionSystemName(collType collSys);
 
   static int getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif);
 };
 
+} // namespace o2::common::core
+
+using CollisionSystemType = o2::common::core::CollisionSystemType;
+
 #endif // COMMON_CORE_COLLISIONTYPEHELPER_H_

Common/Core/MetadataHelper.cxx

@@ -20,13 +20,18 @@
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+using namespace o2::common::core;
+
 MetadataHelper::MetadataHelper()
 {
-  const std::array<std::string, 5> keyList = {"DataType",
+  const std::array<std::string, 8> keyList = {"DataType",
                                               "RecoPassName",
                                               "Run",
                                               "AnchorPassName",
-                                              "AnchorProduction"};
+                                              "AnchorProduction",
+                                              "ROOTVersion",
+                                              "LPMProductionTag",
+                                              "O2Version"};
   for (const auto& key : keyList) {
     mMetadata[key] = "undefined";
   }

Common/Core/MetadataHelper.h

@@ -18,10 +18,14 @@
 #ifndef COMMON_CORE_METADATAHELPER_H_
 #define COMMON_CORE_METADATAHELPER_H_
 
-#include <string>
-#include <map>
 #include "Framework/ConfigContext.h"
 
+#include <map>
+#include <string>
+
+namespace o2::common::core
+{
+
 struct MetadataHelper {
   /// @brief Constructor for the MetadataHelper. Defines the all the metadata keys that will be looked for and accessible
   MetadataHelper();
@@ -64,4 +68,8 @@ struct MetadataHelper {
   bool mIsInitialized = false;                  /// < Flag to check if the metadata has been initialized
 };
 
+} // namespace o2::common::core
+
+using MetadataHelper = o2::common::core::MetadataHelper; // Alias for the MetadataHelper
+
 #endif // COMMON_CORE_METADATAHELPER_H_

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;