Merge branch 'master' into rashi

Author: rashigupt

.clang-tidy

@@ -1,17 +1,16 @@
 CheckOptions:
-  - { key: CheckPathRegex, value: ".*/O2/.*" }
   # Naming conventions
   - { key: readability-identifier-naming.ClassCase, value: CamelCase }
   - { key: readability-identifier-naming.ClassMemberPrefix, value: m }
   - { key: readability-identifier-naming.ConceptCase, value: CamelCase }
   - { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase }
-  - { key: readability-identifier-naming.ConstexprVariableIgnoredRegexp, value: "^k[A-Z].*$" }  # Allow "k" prefix.
+  - { key: readability-identifier-naming.ConstexprVariableIgnoredRegexp, value: "^k[A-Z][a-zA-Z0-9]*$" }  # Allow "k" prefix.
   - { key: readability-identifier-naming.EnumCase, value: CamelCase }
   - { key: readability-identifier-naming.EnumConstantCase, value: CamelCase }
-  - { key: readability-identifier-naming.EnumConstantIgnoredRegexp, value: "^k[A-Z].*$" }  # Allow "k" prefix.
+  - { key: readability-identifier-naming.EnumConstantIgnoredRegexp, value: "^k?[A-Z][a-zA-Z0-9_]*$" }  # Allow "k" prefix and underscores.
   - { key: readability-identifier-naming.FunctionCase, value: camelBack }
   - { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }
-  - { key: readability-identifier-naming.MacroDefinitionIgnoredRegexp, value: "^[A-Z]+(_[A-Z]+)*_$" }  # Allow the trailing underscore in header guards.
+  - { key: readability-identifier-naming.MacroDefinitionIgnoredRegexp, value: "^[A-Z][A-Z0-9_]*_$" }  # Allow the trailing underscore in header guards.
   - { key: readability-identifier-naming.MemberCase, value: camelBack }
   - { key: readability-identifier-naming.NamespaceCase, value: lower_case }
   - { key: readability-identifier-naming.ParameterCase, value: camelBack }

.mega-linter.yml

@@ -39,5 +39,6 @@ PYTHON_PYRIGHT_CONFIG_FILE: pyproject.toml
 PYTHON_RUFF_CONFIG_FILE: pyproject.toml
 CPP_CPPLINT_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
 CPP_CLANG_FORMAT_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
+CPP_CPPCHECK_FILE_EXTENSIONS: [".C", ".c", ".c++", ".cc", ".cl", ".cpp", ".cu", ".cuh", ".cxx", ".cxx.in", ".h", ".h++", ".hh", ".h.in", ".hpp", ".hxx", ".inc", ".inl", ".macro"]
 CPP_CPPCHECK_ARGUMENTS: --language=c++ --std=c++20 --check-level=exhaustive --suppressions-list=cppcheck_config
 REPOSITORY_GITLEAKS_PR_COMMITS_SCAN: true

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -105,7 +105,18 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
     mLUTHeader[ipdg] = nullptr;
     return false;
   }
-  if (mLUTHeader[ipdg]->pdg != pdg) {
+  bool specialPdgCase = false;
+  switch (pdg) {                         // Handle special cases
+    case o2::constants::physics::kAlpha: // Special case: Allow Alpha particles to use He3 LUT
+      specialPdgCase = (mLUTHeader[ipdg]->pdg == o2::constants::physics::kHelium3);
+      if (specialPdgCase)
+        LOG(info)
+          << " --- Alpha particles (PDG " << pdg << ") will use He3 LUT data (PDG " << mLUTHeader[ipdg]->pdg << ")" << std::endl;
+      break;
+    default:
+      break;
+  }
+  if (mLUTHeader[ipdg]->pdg != pdg && !specialPdgCase) {
     LOG(info) << " --- LUT header PDG mismatch: expected/detected = " << pdg << "/" << mLUTHeader[ipdg]->pdg << std::endl;
     delete mLUTHeader[ipdg];
     mLUTHeader[ipdg] = nullptr;

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -29,6 +29,7 @@
 
 #include <TRandom.h>
 
+#include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <map>
@@ -214,6 +215,8 @@ class TrackSmearer
         return 6; // Triton
       case 1000020030:
         return 7; // Helium3
+      case 1000020040:
+        return 8; // Alphas
       default:
         return 2; // Default: pion
     }
@@ -238,6 +241,8 @@ class TrackSmearer
         return "triton";
       case 1000020030:
         return "helium3";
+      case 1000020040:
+        return "alpha";
       default:
         return "pion"; // Default: pion
     }
@@ -246,7 +251,7 @@ class TrackSmearer
   void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdbManager = mgr; } //;
 
  protected:
-  static constexpr unsigned int nLUTs = 8; // Number of LUT available
+  static constexpr unsigned int nLUTs = 9; // Number of LUT available
   lutHeader_t* mLUTHeader[nLUTs] = {nullptr};
   lutEntry_t***** mLUTEntry[nLUTs] = {nullptr};
   bool mUseEfficiency = true;

ALICE3/DataModel/OTFPIDTrk.h

@@ -11,7 +11,6 @@
 
 ///
 /// \file   OTFPIDTrk.h
-/// \author Berkin Ulukutlu TUM
 /// \author Henrik Fribert TUM
 /// \author Nicolò Jacazio Università del Piemonte Orientale
 /// \since  May 22, 2025
@@ -29,23 +28,29 @@ namespace o2::aod
 namespace upgrade::trk
 {
 
-DECLARE_SOA_COLUMN(TimeOverThresholdBarrel, timeOverThresholdBarrel, float);   //! Time over threshold for the barrel layers
-DECLARE_SOA_COLUMN(ClusterSizeBarrel, clusterSizeBarrel, float);               //! Cluster size for the barrel layers
+DECLARE_SOA_COLUMN(TimeOverThresholdBarrel, timeOverThresholdBarrel, float);   //! Time over threshold for the Barrel layers
 DECLARE_SOA_COLUMN(TimeOverThresholdForward, timeOverThresholdForward, float); //! Time over threshold for the Forward layers
-DECLARE_SOA_COLUMN(ClusterSizeForward, clusterSizeForward, float);             //! Cluster size for the barrel layers
 
-DECLARE_SOA_COLUMN(NSigmaTrkEl, nSigmaEl, float); //! NSigma electron from the tracker layers
-DECLARE_SOA_COLUMN(NSigmaTrkMu, nSigmaMu, float); //! NSigma muon from the tracker layers
-DECLARE_SOA_COLUMN(NSigmaTrkPi, nSigmaPi, float); //! NSigma pion from the tracker layers
-DECLARE_SOA_COLUMN(NSigmaTrkKa, nSigmaKa, float); //! NSigma kaon from the tracker layers
-DECLARE_SOA_COLUMN(NSigmaTrkPr, nSigmaPr, float); //! NSigma proton from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkEl, nSigmaTrkEl, float); //! NSigma electron from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkMu, nSigmaTrkMu, float); //! NSigma muon from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkPi, nSigmaTrkPi, float); //! NSigma pion from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkKa, nSigmaTrkKa, float); //! NSigma kaon from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkPr, nSigmaTrkPr, float); //! NSigma proton from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkDe, nSigmaTrkDe, float); //! NSigma deuteron from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkTr, nSigmaTrkTr, float); //! NSigma triton from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkHe, nSigmaTrkHe, float); //! NSigma helium-3 from the tracker layers
+DECLARE_SOA_COLUMN(NSigmaTrkAl, nSigmaTrkAl, float); //! NSigma alpha from the tracker layers
 
 DECLARE_SOA_DYNAMIC_COLUMN(NSigmaTrk, nSigmaTrk, //! General function to get the nSigma for the tracker layers
                            [](const float el,
                               const float mu,
                               const float pi,
                               const float ka,
                               const float pr,
+                              const float de,
+                              const float tr,
+                              const float he,
+                              const float al,
                               const int id) -> float {
                              switch (std::abs(id)) {
                                case 0:
@@ -58,29 +63,46 @@ DECLARE_SOA_DYNAMIC_COLUMN(NSigmaTrk, nSigmaTrk, //! General function to get the
                                  return ka;
                                case 4:
                                  return pr;
+                               case 5:
+                                 return de;
+                               case 6:
+                                 return tr;
+                               case 7:
+                                 return he;
+                               case 8:
+                                 return al;
                                default:
-                                 LOG(fatal) << "Unrecognized PDG code for InnerTOF";
+                                 LOG(fatal) << "Unrecognized PDG code";
                                  return 999.f;
                              }
                            });
 
 } // namespace upgrade::trk
 
 DECLARE_SOA_TABLE(UpgradeTrkPidSignals, "AOD", "UPGRADETRKSIG",
-                  upgrade::trk::TimeOverThresholdBarrel,
-                  upgrade::trk::ClusterSizeBarrel);
+                  o2::soa::Index<>,
+                  upgrade::trk::TimeOverThresholdBarrel);
 
 DECLARE_SOA_TABLE(UpgradeTrkPids, "AOD", "UPGRADETRKPID",
+                  o2::soa::Index<>,
                   upgrade::trk::NSigmaTrkEl,
                   upgrade::trk::NSigmaTrkMu,
                   upgrade::trk::NSigmaTrkPi,
                   upgrade::trk::NSigmaTrkKa,
                   upgrade::trk::NSigmaTrkPr,
+                  upgrade::trk::NSigmaTrkDe,
+                  upgrade::trk::NSigmaTrkTr,
+                  upgrade::trk::NSigmaTrkHe,
+                  upgrade::trk::NSigmaTrkAl,
                   upgrade::trk::NSigmaTrk<upgrade::trk::NSigmaTrkEl,
                                           upgrade::trk::NSigmaTrkMu,
                                           upgrade::trk::NSigmaTrkPi,
                                           upgrade::trk::NSigmaTrkKa,
-                                          upgrade::trk::NSigmaTrkPr>);
+                                          upgrade::trk::NSigmaTrkPr,
+                                          upgrade::trk::NSigmaTrkDe,
+                                          upgrade::trk::NSigmaTrkTr,
+                                          upgrade::trk::NSigmaTrkHe,
+                                          upgrade::trk::NSigmaTrkAl>);
 
 using UpgradeTrkPidSignal = UpgradeTrkPidSignals::iterator;
 using UpgradeTrkPid = UpgradeTrkPids::iterator;

ALICE3/DataModel/OTFRICH.h

@@ -31,12 +31,20 @@ DECLARE_SOA_COLUMN(NSigmaMuonRich, nSigmaMuonRich, float);         //! NSigma mu
 DECLARE_SOA_COLUMN(NSigmaPionRich, nSigmaPionRich, float);         //! NSigma pion BarrelRich
 DECLARE_SOA_COLUMN(NSigmaKaonRich, nSigmaKaonRich, float);         //! NSigma kaon BarrelRich
 DECLARE_SOA_COLUMN(NSigmaProtonRich, nSigmaProtonRich, float);     //! NSigma proton BarrelRich
+DECLARE_SOA_COLUMN(NSigmaDeuteronRich, nSigmaDeuteronRich, float); //! NSigma deuteron BarrelRich
+DECLARE_SOA_COLUMN(NSigmaTritonRich, nSigmaTritonRich, float);     //! NSigma triton BarrelRich
+DECLARE_SOA_COLUMN(NSigmaHelium3Rich, nSigmaHelium3Rich, float);   //! NSigma helium3 BarrelRich
+DECLARE_SOA_COLUMN(NSigmaAlphaRich, nSigmaAlphaRich, float);       //! NSigma alpha BarrelRich
 DECLARE_SOA_DYNAMIC_COLUMN(NSigmaRich, nSigmaRich,                 //! General function to get the nSigma for the RICH
                            [](const float el,
                               const float mu,
                               const float pi,
                               const float ka,
                               const float pr,
+                              const float de,
+                              const float tr,
+                              const float he3,
+                              const float al,
                               const int id) -> float {
                              switch (std::abs(id)) {
                                case 0:
@@ -49,6 +57,14 @@ DECLARE_SOA_DYNAMIC_COLUMN(NSigmaRich, nSigmaRich,                 //! General f
                                  return ka;
                                case 4:
                                  return pr;
+                               case 5:
+                                 return de;
+                               case 6:
+                                 return tr;
+                               case 7:
+                                 return he3;
+                               case 8:
+                                 return al;
                                default:
                                  LOG(fatal) << "Unrecognized PDG code for RICH";
                                  return 999.f;
@@ -62,6 +78,10 @@ DECLARE_SOA_COLUMN(HasSigMu, hasSigMu, bool);       //! Has nSigma muon BarrelRi
 DECLARE_SOA_COLUMN(HasSigPi, hasSigPi, bool);       //! Has nSigma pion BarrelRich (is pion over threshold)
 DECLARE_SOA_COLUMN(HasSigKa, hasSigKa, bool);       //! Has nSigma kaon BarrelRich (is kaon over threshold)
 DECLARE_SOA_COLUMN(HasSigPr, hasSigPr, bool);       //! Has nSigma proton BarrelRich (is proton over threshold)
+DECLARE_SOA_COLUMN(HasSigDe, hasSigDe, bool);       //! Has nSigma deuteron BarrelRich (is deuteron over threshold)
+DECLARE_SOA_COLUMN(HasSigTr, hasSigTr, bool);       //! Has nSigma triton BarrelRich (is triton over threshold)
+DECLARE_SOA_COLUMN(HasSigHe3, hasSigHe3, bool);     //! Has nSigma helium3 BarrelRich (is helium3 over threshold)
+DECLARE_SOA_COLUMN(HasSigAl, hasSigAl, bool);       //! Has nSigma alpha BarrelRich (is alpha over threshold)
 
 } // namespace upgrade_rich
 DECLARE_SOA_TABLE(UpgradeRichs, "AOD", "UPGRADERICH",
@@ -70,11 +90,19 @@ DECLARE_SOA_TABLE(UpgradeRichs, "AOD", "UPGRADERICH",
                   upgrade_rich::NSigmaPionRich,
                   upgrade_rich::NSigmaKaonRich,
                   upgrade_rich::NSigmaProtonRich,
+                  upgrade_rich::NSigmaDeuteronRich,
+                  upgrade_rich::NSigmaTritonRich,
+                  upgrade_rich::NSigmaHelium3Rich,
+                  upgrade_rich::NSigmaAlphaRich,
                   upgrade_rich::NSigmaRich<upgrade_rich::NSigmaElectronRich,
                                            upgrade_rich::NSigmaMuonRich,
                                            upgrade_rich::NSigmaPionRich,
                                            upgrade_rich::NSigmaKaonRich,
-                                           upgrade_rich::NSigmaProtonRich>);
+                                           upgrade_rich::NSigmaProtonRich,
+                                           upgrade_rich::NSigmaDeuteronRich,
+                                           upgrade_rich::NSigmaTritonRich,
+                                           upgrade_rich::NSigmaHelium3Rich,
+                                           upgrade_rich::NSigmaAlphaRich>);
 
 using UpgradeRich = UpgradeRichs::iterator;
 
@@ -85,6 +113,10 @@ DECLARE_SOA_TABLE(UpgradeRichSignals, "AOD", "UPGRADERICHSIG",
                   upgrade_rich::HasSigPi,
                   upgrade_rich::HasSigKa,
                   upgrade_rich::HasSigPr,
+                  upgrade_rich::HasSigDe,
+                  upgrade_rich::HasSigTr,
+                  upgrade_rich::HasSigHe3,
+                  upgrade_rich::HasSigAl,
                   upgrade_rich::HasSigInGas);
 
 using UpgradeRichSignal = UpgradeRichSignals::iterator;