Merge branch 'AliceO2Group:master' into master

Author: jmunozme

.clang-tidy

@@ -1,17 +1,15 @@
 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.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 non-trailing underscores in PDG names.
   - { 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 }

.github/labeler.yml

@@ -1,69 +1,89 @@
 ---
-alice3:
+infrastructure:
   - changed-files:
-      - any-glob-to-any-file: ['ALICE3/**']
+      - any-glob-to-any-file:
+          - ".checkov.yml"
+          - ".clang-format"
+          - ".clang-tidy"
+          - ".flake8"
+          - ".git-blame-ignore-revs"
+          - ".github/**"
+          - ".gitignore"
+          - ".mega-linter.yml"
+          - ".pre-commit-config.yaml"
+          - "cmake/**"
+          - "CMakeLists.txt"
+          - "CODEOWNERS"
+          - "COPYING"
+          - "cppcheck_config"
+          - "CPPLINT.cfg"
+          - "dependencies/**"
+          - "o2linter_config"
+          - "packaging/**"
+          - "pyproject.toml"
+          - "README.md"
 
-common:
+datamodel:
   - changed-files:
-      - any-glob-to-any-file: ['Common/**']
+      - any-glob-to-any-file: ["DataModel/**", "**/DataModel/**"]
 
-infrastructure:
+alice3:
   - changed-files:
-      - any-glob-to-any-file:
-          - '.clang-format'
-          - '.clang-tidy'
-          - '.flake8'
-          - '.github/**'
-          - '.checkov.yml'
-          - '.mega-linter.yml'
-          - '.pre-commit-config.yaml'
-          - 'cmake/**'
-          - 'CODEOWNERS'
-          - 'CPPLINT.cfg'
-          - 'dependencies/**'
-          - 'packaging/**'
-          - 'pyproject.toml'
+      - any-glob-to-any-file: ["ALICE3/**"]
 
-datamodel:
+common:
   - changed-files:
-      - any-glob-to-any-file: ['DataModel/**', '**/DataModel/**']
+      - any-glob-to-any-file: ["Common/**"]
 
 dpg:
   - changed-files:
-      - any-glob-to-any-file: ['DPG/**']
+      - any-glob-to-any-file: ["DPG/**"]
 
 pwgcf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGCF/**', '*/PWGCF/**']
+      - any-glob-to-any-file: ["PWGCF/**", "*/PWGCF/**"]
 
 pwgdq:
   - changed-files:
-      - any-glob-to-any-file: ['PWGDQ/**', '*/PWGDQ/**']
+      - any-glob-to-any-file: ["PWGDQ/**", "*/PWGDQ/**"]
 
 pwgem:
   - changed-files:
-      - any-glob-to-any-file: ['PWGEM/**', '*/PWGEM/**']
+      - any-glob-to-any-file: ["PWGEM/**", "*/PWGEM/**"]
 
 pwghf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGHF/**', '*/PWGHF/**']
+      - any-glob-to-any-file: ["PWGHF/**", "*/PWGHF/**"]
 
 pwgje:
   - changed-files:
-      - any-glob-to-any-file: ['PWGJE/**', '*/PWGJE/**']
+      - any-glob-to-any-file: ["PWGJE/**", "*/PWGJE/**"]
 
 pwglf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGLF/**', '*/PWGLF/**', 'PWGMM/**', '*/PWGMM/**']
+      - any-glob-to-any-file:
+          ["PWGLF/**", "*/PWGLF/**", "PWGMM/**", "*/PWGMM/**"]
+
+pwgmm:
+  - changed-files:
+      - any-glob-to-any-file: ["PWGMM/**", "*/PWGMM/**"]
 
 pwgud:
   - changed-files:
-      - any-glob-to-any-file: ['PWGUD/**', '*/PWGUD/**']
+      - any-glob-to-any-file: ["PWGUD/**", "*/PWGUD/**"]
+
+scripts:
+  - changed-files:
+      - any-glob-to-any-file: ["Scripts/**"]
+
+tools:
+  - changed-files:
+      - any-glob-to-any-file: ["Tools/**"]
 
 trigger:
   - changed-files:
-      - any-glob-to-any-file: ['EventFiltering/**']
+      - any-glob-to-any-file: ["EventFiltering/**"]
 
 tutorial:
   - changed-files:
-      - any-glob-to-any-file: ['Tutorials/**']
+      - any-glob-to-any-file: ["Tutorials/**"]

.github/workflows/mega-linter.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       # Git Checkout
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Checkout the HEAD of the PR instead of the merge commit.
           ref: ${{ github.event.pull_request.head.sha }}
@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v9.0.1
+        uses: oxsecurity/megalinter@v9.2.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/
@@ -49,7 +49,7 @@ jobs:
 
       # Upload MegaLinter artifacts
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: MegaLinter reports

.github/workflows/o2-linter.yml

@@ -30,7 +30,7 @@ jobs:
           echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
           echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.BRANCH_HEAD }}
           fetch-depth: 0 # needed to get the full history

.github/workflows/stale.yml

@@ -17,6 +17,8 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: 'This PR has not been updated in the last 30 days. Is it still needed? Unless further action is taken, it will be closed in 5 days.'
+          stale-issue-message: 'This issue has not been updated in the last 30 days. Is it still needed? Unless further action is taken, it will be closed in 5 days.'
           stale-pr-label: stale
           days-before-stale: 30
           days-before-close: 5
+          exempt-issue-labels: bug,enhancement

.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

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.5 # clang-format version
+    rev: v21.1.8 # clang-format version
     hooks:
       - id: clang-format
   - repo: https://github.com/cpplint/cpplint

ALICE3/CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory(Core)
 # add_subdirectory(DataModel)
 add_subdirectory(Tasks)
 add_subdirectory(TableProducer)
-# add_subdirectory(Tools)
+add_subdirectory(Macros)

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -66,6 +66,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
     std::string path = std::string(filename).substr(5); // Remove "ccdb:" prefix
     const std::string outPath = "/tmp/LUTs/";
     filename = Form("%s/%s/snapshot.root", outPath.c_str(), path.c_str());
+    LOG(info) << " --- Local LUT filename will be: " << filename;
     std::ifstream checkFile(filename); // Check if file already exists
     if (!checkFile.is_open()) {        // File does not exist, retrieve from CCDB
       LOG(info) << " --- CCDB source detected for PDG " << pdg << ": " << path;
@@ -76,6 +77,15 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
       mCcdbManager->getCCDBAccessor().retrieveBlob(path, outPath, metadata, 1);
       // Add CCDB handling logic here if needed
       LOG(info) << " --- Now retrieving LUT file from CCDB to: " << filename;
+      if (mCleanupDownloadedFile) { // Clean up the downloaded file if needed
+        bool status = loadTable(pdg, filename, forceReload);
+        if (std::remove(filename) != 0) {
+          LOG(warn) << " --- Could not remove temporary LUT file: " << filename;
+        } else {
+          LOG(info) << " --- Removed temporary LUT file: " << filename;
+        }
+        return status;
+      }
     } else { // File exists, proceed to load
       LOG(info) << " --- LUT file already exists: " << filename << ". Skipping download.";
       checkFile.close();
@@ -153,12 +163,13 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
 
 /*****************************************************************/
 
-lutEntry_t*
-  TrackSmearer::getLUTEntry(int pdg, float nch, float radius, float eta, float pt, float& interpolatedEff)
+lutEntry_t* TrackSmearer::getLUTEntry(const int pdg, const float nch, const float radius, const float eta, const float pt, float& interpolatedEff)
 {
-  auto ipdg = getIndexPDG(pdg);
-  if (!mLUTHeader[ipdg])
+  const int ipdg = getIndexPDG(pdg);
+  if (!mLUTHeader[ipdg]) {
     return nullptr;
+  }
+
   auto inch = mLUTHeader[ipdg]->nchmap.find(nch);
   auto irad = mLUTHeader[ipdg]->radmap.find(radius);
   auto ieta = mLUTHeader[ipdg]->etamap.find(eta);
@@ -280,7 +291,6 @@ bool TrackSmearer::smearTrack(O2Track& o2track, lutEntry_t* lutEntry, float inte
 
 bool TrackSmearer::smearTrack(O2Track& o2track, int pdg, float nch)
 {
-
   auto pt = o2track.getPt();
   switch (pdg) {
     case o2::constants::physics::kHelium3:
@@ -290,56 +300,56 @@ bool TrackSmearer::smearTrack(O2Track& o2track, int pdg, float nch)
   }
   auto eta = o2track.getEta();
   float interpolatedEff = 0.0f;
-  auto lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, interpolatedEff);
+  lutEntry_t* lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, interpolatedEff);
   if (!lutEntry || !lutEntry->valid)
     return false;
   return smearTrack(o2track, lutEntry, interpolatedEff);
 }
 
 /*****************************************************************/
 // relative uncertainty on pt
-double TrackSmearer::getPtRes(int pdg, float nch, float eta, float pt)
+double TrackSmearer::getPtRes(const int pdg, const float nch, const float eta, const float pt)
 {
   float dummy = 0.0f;
-  auto lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
+  lutEntry_t* lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
   auto val = std::sqrt(lutEntry->covm[14]) * lutEntry->pt;
   return val;
 }
 
 /*****************************************************************/
 // relative uncertainty on eta
-double TrackSmearer::getEtaRes(int pdg, float nch, float eta, float pt)
+double TrackSmearer::getEtaRes(const int pdg, const float nch, const float eta, const float pt)
 {
   float dummy = 0.0f;
-  auto lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
+  lutEntry_t* lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
   auto sigmatgl = std::sqrt(lutEntry->covm[9]);                                  // sigmatgl2
   auto etaRes = std::fabs(std::sin(2.0 * std::atan(std::exp(-eta)))) * sigmatgl; // propagate tgl to eta uncertainty
   etaRes /= lutEntry->eta;                                                       // relative uncertainty
   return etaRes;
 }
 /*****************************************************************/
 // absolute uncertainty on pt
-double TrackSmearer::getAbsPtRes(int pdg, float nch, float eta, float pt)
+double TrackSmearer::getAbsPtRes(const int pdg, const float nch, const float eta, const float pt)
 {
   float dummy = 0.0f;
-  auto lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
+  lutEntry_t* lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
   auto val = std::sqrt(lutEntry->covm[14]) * lutEntry->pt * lutEntry->pt;
   return val;
 }
 
 /*****************************************************************/
 // absolute uncertainty on eta
-double TrackSmearer::getAbsEtaRes(int pdg, float nch, float eta, float pt)
+double TrackSmearer::getAbsEtaRes(const int pdg, const float nch, const float eta, const float pt)
 {
   float dummy = 0.0f;
-  auto lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
+  lutEntry_t* lutEntry = getLUTEntry(pdg, nch, 0., eta, pt, dummy);
   auto sigmatgl = std::sqrt(lutEntry->covm[9]);                                  // sigmatgl2
   auto etaRes = std::fabs(std::sin(2.0 * std::atan(std::exp(-eta)))) * sigmatgl; // propagate tgl to eta uncertainty
   return etaRes;
 }
 /*****************************************************************/
 // efficiency
-double TrackSmearer::getEfficiency(int pdg, float nch, float eta, float pt)
+double TrackSmearer::getEfficiency(const int pdg, const float nch, const float eta, const float pt)
 {
   float efficiency = 0.0f;
   getLUTEntry(pdg, nch, 0., eta, pt, efficiency);
@@ -360,7 +370,7 @@ double TrackSmearer::getEfficiency(int pdg, float nch, float eta, float pt)
 //   return true;
 
 // #if 0
-//   auto lutEntry = getLUTEntry(track.PID, 0., 0., track.Eta, track.PT);
+//   lutEntry_t* lutEntry = getLUTEntry(track.PID, 0., 0., track.Eta, track.PT);
 //   if (!lutEntry)
 //     return;
 

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -180,23 +180,24 @@ class TrackSmearer
 
   /** LUT methods **/
   bool loadTable(int pdg, const char* filename, bool forceReload = false);
-  void useEfficiency(bool val) { mUseEfficiency = val; }                      //;
-  void interpolateEfficiency(bool val) { mInterpolateEfficiency = val; }      //;
-  void skipUnreconstructed(bool val) { mSkipUnreconstructed = val; }          //;
-  void setWhatEfficiency(int val) { mWhatEfficiency = val; }                  //;
-  lutHeader_t* getLUTHeader(int pdg) { return mLUTHeader[getIndexPDG(pdg)]; } //;
-  lutEntry_t* getLUTEntry(int pdg, float nch, float radius, float eta, float pt, float& interpolatedEff);
+  bool hasTable(int pdg) { return (mLUTHeader[getIndexPDG(pdg)] != nullptr); } //;
+  void useEfficiency(bool val) { mUseEfficiency = val; }                       //;
+  void interpolateEfficiency(bool val) { mInterpolateEfficiency = val; }       //;
+  void skipUnreconstructed(bool val) { mSkipUnreconstructed = val; }           //;
+  void setWhatEfficiency(int val) { mWhatEfficiency = val; }                   //;
+  lutHeader_t* getLUTHeader(int pdg) { return mLUTHeader[getIndexPDG(pdg)]; }  //;
+  lutEntry_t* getLUTEntry(const int pdg, const float nch, const float radius, const float eta, const float pt, float& interpolatedEff);
 
   bool smearTrack(O2Track& o2track, lutEntry_t* lutEntry, float interpolatedEff);
   bool smearTrack(O2Track& o2track, int pdg, float nch);
   // bool smearTrack(Track& track, bool atDCA = true); // Only in DelphesO2
-  double getPtRes(int pdg, float nch, float eta, float pt);
-  double getEtaRes(int pdg, float nch, float eta, float pt);
-  double getAbsPtRes(int pdg, float nch, float eta, float pt);
-  double getAbsEtaRes(int pdg, float nch, float eta, float pt);
-  double getEfficiency(int pdg, float nch, float eta, float pt);
+  double getPtRes(const int pdg, const float nch, const float eta, const float pt);
+  double getEtaRes(const int pdg, const float nch, const float eta, const float pt);
+  double getAbsPtRes(const int pdg, const float nch, const float eta, const float pt);
+  double getAbsEtaRes(const int pdg, const float nch, const float eta, const float pt);
+  double getEfficiency(const int pdg, const float nch, const float eta, const float pt);
 
-  int getIndexPDG(int pdg)
+  int getIndexPDG(const int pdg)
   {
     switch (abs(pdg)) {
       case 11:
@@ -249,6 +250,7 @@ class TrackSmearer
   }
   void setdNdEta(float val) { mdNdEta = val; }                                 //;
   void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdbManager = mgr; } //;
+  void setCleanupDownloadedFile(bool val) { mCleanupDownloadedFile = val; }    //;
 
  protected:
   static constexpr unsigned int nLUTs = 9; // Number of LUT available
@@ -262,6 +264,7 @@ class TrackSmearer
 
  private:
   o2::ccdb::BasicCCDBManager* mCcdbManager = nullptr;
+  bool mCleanupDownloadedFile = true;
 };
 
 } // namespace delphes