Merge remote-tracking branch 'upstream/master' into daiki-tof

Author: romainschotter

.github/labeler.yml

@@ -87,3 +87,7 @@ trigger:
 tutorial:
   - changed-files:
       - any-glob-to-any-file: ["Tutorials/**"]
+
+photon:
+  - changed-files:
+      - any-glob-to-any-file: ["PWGEM/PhotonMeson/**", "*/PWGEM/PhotonMeson/**"]

.github/workflows/mega-linter.yml

@@ -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.3.0
+        uses: oxsecurity/megalinter@v9.4.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@v6
+        uses: actions/upload-artifact@v7
         if: success() || failure()
         with:
           name: MegaLinter reports

.github/workflows/o2-linter.yml

@@ -2,7 +2,7 @@
 # Find issues in O2 code
 name: O2 linter
 
-#"on": [pull_request_target, push]
+"on": [pull_request_target, push]
 permissions: {}
 env:
   BRANCH_MAIN: master
@@ -20,12 +20,12 @@ jobs:
     steps:
       - name: Set branches
         run: |
-          if [[ "${{ github.event_name }}" == "push" ]]; then
+          if [[ "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "pull_request" ]]; then
             branch_head="${{ github.ref }}"
-            branch_base="${{ env.BRANCH_MAIN }}"
+            branch_base="origin/${{ env.BRANCH_MAIN }}"
           else
             branch_head="refs/pull/${{ github.event.pull_request.number }}/merge"
-            branch_base="${{ github.event.pull_request.base.ref }}"
+            branch_base="origin/${{ github.event.pull_request.base.ref }}"
           fi
           echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
           echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
@@ -37,9 +37,10 @@ jobs:
       - name: Run tests
         id: linter
         run: |
+          git log -n 1 --pretty='format:%ci %h %s %d%n'
           # Diff against the common ancestor of the source (head) branch and the target (base) branch.
           echo "Diffing ${{ env.BRANCH_HEAD }} against ${{ env.BRANCH_BASE }}."
-          readarray -t files < <(git diff --diff-filter d --name-only origin/${{ env.BRANCH_BASE }}...)
+          readarray -t files < <(git diff --diff-filter d --name-only ${{ env.BRANCH_BASE }}...)
           if [ ${#files[@]} -eq 0 ]; then
               echo "::notice::No files to lint."
               echo "linter_ran=0" >> "$GITHUB_OUTPUT"

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.8 # clang-format version
+    rev: v20.1.3 # clang-format version (keep synced with https://github.com/alisw/ali-bot/blob/master/.github/workflows/c++-code-formatting.yml)
     hooks:
       - id: clang-format
   - repo: https://github.com/cpplint/cpplint

ALICE3/Core/ALICE3CoreLinkDef.h

@@ -14,3 +14,5 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::pid::tof::TOFResoALICE3 + ;
+#pragma link C++ class std::vector < std::vector < unsigned int>> + ;
+#pragma link C++ class std::vector < std::vector < std::uint32_t>> + ;

ALICE3/Core/CMakeLists.txt

@@ -13,13 +13,15 @@ o2physics_add_library(ALICE3Core
                       SOURCES TOFResoALICE3.cxx
                               TrackUtilities.cxx
                               DelphesO2TrackSmearer.cxx
+                              GeometryContainer.cxx
                       PUBLIC_LINK_LIBRARIES O2::Framework
                                             O2Physics::AnalysisCore)
 
 o2physics_target_root_dictionary(ALICE3Core
                       HEADERS TOFResoALICE3.h
                               TrackUtilities.h
                               DelphesO2TrackSmearer.h
+                              GeometryContainer.h
                       LINKDEF ALICE3CoreLinkDef.h)
 
 o2physics_add_library(FastTracker

ALICE3/Core/Decayer.h

@@ -21,18 +21,18 @@
 
 #include "ALICE3/Core/TrackUtilities.h"
 
-#include "ReconstructionDataFormats/Track.h"
+#include <CommonConstants/PhysicsConstants.h>
+#include <MathUtils/Primitive2D.h>
+#include <ReconstructionDataFormats/Track.h>
 
-#include <TDatabasePDG.h>
-#include <TDecayChannel.h>
+#include <TDecayChannel.h> // IWYU pragma: keep
 #include <TGenPhaseSpace.h>
 #include <TLorentzVector.h>
-#include <TParticlePDG.h>
 #include <TRandom3.h>
 
 #include <array>
 #include <cmath>
-#include <string>
+#include <cstddef>
 #include <vector>
 
 namespace o2

ALICE3/Core/DelphesO2LutWriter.cxx

@@ -25,14 +25,27 @@
 #include "ALICE3/Core/FastTracker.h"
 #include "ALICE3/Core/TrackUtilities.h"
 
-#include "TAxis.h"
-#include "TDatabasePDG.h"
-#include "TLorentzVector.h"
-#include "TMatrixD.h"
-#include "TMatrixDSymEigen.h"
-#include "TVectorD.h"
-
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/Track.h>
+
+#include <TAxis.h>
+#include <TDatabasePDG.h>
+#include <TGraph.h>
+#include <TLorentzVector.h>
+#include <TMatrixD.h> // IWYU pragma: keep (do not replace with TMatrixDfwd.h)
+#include <TMatrixDSymEigen.h>
+#include <TMatrixDSymfwd.h>
+#include <TMatrixDfwd.h>
+#include <TParticlePDG.h>
+#include <TString.h>
+#include <TVectorDfwd.h>
+
+#include <Rtypes.h>
+
+#include <cmath>
 #include <cstdio>
+#include <cstdlib>
+#include <fstream>
 #include <string>
 
 // #define USE_FWD_PARAM

ALICE3/Core/DelphesO2LutWriter.h

@@ -23,10 +23,13 @@
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 #include "ALICE3/Core/FastTracker.h"
 
-#include "ReconstructionDataFormats/PID.h"
+#include <ReconstructionDataFormats/PID.h>
 
-#include "TGraph.h"
+#include <TGraph.h>
 
+#include <Rtypes.h>
+
+#include <cstddef>
 #include <string>
 
 namespace o2::fastsim

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -28,18 +28,18 @@
 /// @author: Roberto Preghenella
 /// @email: preghenella@bo.infn.it
 
-// #include "TrackSmearer.hh"
-// #include "TrackUtils.hh"
-// #include "TRandom.h"
-// #include <iostream>
-// #include <fstream>
-
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 
+#include "ALICE3/Core/GeometryContainer.h"
+
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/Logger.h>
 
-#include <map>
+#include <TRandom.h>
+
+#include <cmath>
+#include <fstream>
+#include <ostream>
 #include <string>
 
 namespace o2
@@ -61,42 +61,13 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
     LOG(info) << " --- LUT table for PDG " << pdg << " has been already loaded with index " << ipdg << std::endl;
     return false;
   }
-  if (strncmp(filename, "ccdb:", 5) == 0) { // Check if filename starts with "ccdb:"
-    LOG(info) << " --- LUT file source identified as CCDB.";
-    std::string path = std::string(filename).substr(5); // Remove "ccdb:" prefix
-    filename = Form("%s/%s/snapshot.root", mOutPath.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;
-      if (!mCcdbManager) {
-        LOG(fatal) << " --- CCDB manager not set. Please set it before loading LUT from CCDB.";
-      }
-      std::map<std::string, std::string> metadata;
-      mCcdbManager->getCCDBAccessor().retrieveBlob(path, mOutPath, 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();
-    }
-    return loadTable(pdg, filename, forceReload);
-  }
 
+  const std::string localFilename = o2::fastsim::GeometryEntry::accessFile(filename, "./.ALICE3/LUTs/", mCcdbManager, 10);
   mLUTHeader[ipdg] = new lutHeader_t;
 
-  std::ifstream lutFile(filename, std::ifstream::binary);
+  std::ifstream lutFile(localFilename, std::ifstream::binary);
   if (!lutFile.is_open()) {
-    LOG(info) << " --- cannot open covariance matrix file for PDG " << pdg << ": " << filename << std::endl;
+    LOG(info) << " --- cannot open covariance matrix file for PDG " << pdg << ": " << localFilename << std::endl;
     delete mLUTHeader[ipdg];
     mLUTHeader[ipdg] = nullptr;
     return false;
@@ -147,7 +118,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
           mLUTEntry[ipdg][inch][irad][ieta][ipt] = new lutEntry_t;
           lutFile.read(reinterpret_cast<char*>(mLUTEntry[ipdg][inch][irad][ieta][ipt]), sizeof(lutEntry_t));
           if (lutFile.gcount() != sizeof(lutEntry_t)) {
-            LOG(info) << " --- troubles reading covariance matrix entry for PDG " << pdg << ": " << filename << std::endl;
+            LOG(info) << " --- troubles reading covariance matrix entry for PDG " << pdg << ": " << localFilename << std::endl;
             LOG(info) << " --- expected/detected " << sizeof(lutHeader_t) << "/" << lutFile.gcount() << std::endl;
             return false;
           }