Merge branch 'AliceO2Group:master' into master

Author: hyungjun-lee

.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.1.0
+        uses: oxsecurity/megalinter@v9.2.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.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

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -76,6 +76,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();
@@ -157,9 +166,9 @@ lutEntry_t* TrackSmearer::getLUTEntry(const int pdg, const float nch, const floa
 {
   const int ipdg = getIndexPDG(pdg);
   if (!mLUTHeader[ipdg]) {
-    LOG(error) << " --- getLUTEntry: LUT header not loaded for pdg=" << pdg << ". Returning nullptr.";
     return nullptr;
   }
+
   auto inch = mLUTHeader[ipdg]->nchmap.find(nch);
   auto irad = mLUTHeader[ipdg]->radmap.find(radius);
   auto ieta = mLUTHeader[ipdg]->etamap.find(eta);
@@ -281,7 +290,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:

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -250,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
@@ -263,6 +264,7 @@ class TrackSmearer
 
  private:
   o2::ccdb::BasicCCDBManager* mCcdbManager = nullptr;
+  bool mCleanupDownloadedFile = true;
 };
 
 } // namespace delphes

ALICE3/Core/DetLayer.cxx

@@ -28,63 +28,63 @@ namespace o2::fastsim
 {
 
 // Parametric constructor
-DetLayer::DetLayer(const TString& name_,
-                   float r_,
-                   float z_,
-                   float x0_,
-                   float xrho_,
-                   float resRPhi_,
-                   float resZ_,
-                   float eff_,
-                   int type_)
-  : name(name_),
-    r(r_),
-    z(z_),
-    x0(x0_),
-    xrho(xrho_),
-    resRPhi(resRPhi_),
-    resZ(resZ_),
-    eff(eff_),
-    type(type_)
+DetLayer::DetLayer(const TString& name,
+                   float r,
+                   float z,
+                   float x0,
+                   float xrho,
+                   float resRPhi,
+                   float resZ,
+                   float eff,
+                   int type)
+  : mName(name),
+    mR(r),
+    mZ(z),
+    mX0(x0),
+    mXrho(xrho),
+    mResRPhi(resRPhi),
+    mResZ(resZ),
+    mEff(eff),
+    mType(type)
 {
 }
 
 DetLayer::DetLayer(const DetLayer& other)
-  : name(other.name), r(other.r), z(other.z), x0(other.x0), xrho(other.xrho), resRPhi(other.resRPhi), resZ(other.resZ), eff(other.eff), type(other.type)
+  : mName(other.mName), mR(other.mR), mZ(other.mZ), mX0(other.mX0), mXrho(other.mXrho), mResRPhi(other.mResRPhi), mResZ(other.mResZ), mEff(other.mEff), mType(other.mType)
 {
 }
 
 void DetLayer::addDeadPhiRegion(float phiStart, float phiEnd)
 {
-  static constexpr float kDefaultValue = 2.f;
-  static constexpr float kPhiTolerance = 1e-4f;
+  static constexpr float DefaultValue = 2.f;
+  static constexpr float PhiTolerance = 1e-4f;
   if (mDeadPhiRegions == nullptr) {
     mDeadPhiRegions = new TGraph();
-    mDeadPhiRegions->SetNameTitle(Form("deadPhiRegions_%s", name.Data()), Form("Dead phi regions for layer %s", name.Data()));
-    mDeadPhiRegions->AddPoint(0, kDefaultValue);
-    mDeadPhiRegions->AddPoint(o2::constants::math::TwoPI, kDefaultValue);
+    mDeadPhiRegions->SetNameTitle(Form("deadPhiRegions_%s", mName.Data()), Form("Dead phi regions for layer %s", mName.Data()));
+    mDeadPhiRegions->AddPoint(0, DefaultValue);
+    mDeadPhiRegions->AddPoint(o2::constants::math::TwoPI, DefaultValue);
   }
   if (phiStart < 0 || phiStart >= o2::constants::math::TwoPI || phiEnd < 0 || phiEnd >= o2::constants::math::TwoPI) {
-    LOG(fatal) << "Cannot add dead phi region with invalid range [" << phiStart << ", " << phiEnd << "] to layer " << name;
+    LOG(fatal) << "Cannot add dead phi region with invalid range [" << phiStart << ", " << phiEnd << "] to layer " << mName;
     return;
   }
-  mDeadPhiRegions->AddPoint(phiStart, kDefaultValue);
-  mDeadPhiRegions->AddPoint(phiEnd, kDefaultValue);
-  mDeadPhiRegions->AddPoint(phiStart + kPhiTolerance, 0.f);
-  mDeadPhiRegions->AddPoint(phiEnd - kPhiTolerance, 0.f);
+  mDeadPhiRegions->AddPoint(phiStart, DefaultValue);
+  mDeadPhiRegions->AddPoint(phiEnd, DefaultValue);
+  mDeadPhiRegions->AddPoint(phiStart + PhiTolerance, 0.f);
+  mDeadPhiRegions->AddPoint(phiEnd - PhiTolerance, 0.f);
   mDeadPhiRegions->Sort();
 }
 
 void DetLayer::setDeadPhiRegions(TGraph* graph)
 {
-  LOG(debug) << "Setting dead phi regions for layer " << name << " with graph " << (graph ? graph->GetName() : "nullptr");
+  LOG(debug) << "Setting dead phi regions for layer " << mName << " with graph " << (graph ? graph->GetName() : "nullptr");
   if (mDeadPhiRegions != nullptr) {
-    LOG(warning) << "Overriding existing dead phi regions for layer " << name;
+    LOG(warning) << "Overriding existing dead phi regions for layer " << mName;
     delete mDeadPhiRegions;
   }
   mDeadPhiRegions = graph;
   if (mDeadPhiRegions->GetN() == 0) {
-    LOG(warning) << "Dead phi regions graph for layer " << name << " is empty, clearing dead regions";
+    LOG(warning) << "Dead phi regions graph for layer " << mName << " is empty, clearing dead regions";
     mDeadPhiRegions = nullptr;
     return; // cleared the dead regions
   }
@@ -95,51 +95,59 @@ void DetLayer::setDeadPhiRegions(TGraph* graph)
       const float y = mDeadPhiRegions->GetY()[i];
       // First point has to be at 0, last point has to be at 2PI
       if ((i == 0 && x != 0.f) || (i == mDeadPhiRegions->GetN() - 1 && x != o2::constants::math::TwoPI)) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid x value " << x << " at point " << i << ", first point should be 0 and last point should be 2PI";
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid x value " << x << " at point " << i << ", first point should be 0 and last point should be 2PI";
       }
       LOG(debug) << "Point " << i << ": (" << x << ", " << y << ")";
       if (x < 0 || x > o2::constants::math::TwoPI) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid x value " << x << " at point " << i;
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid x value " << x << " at point " << i;
       }
-      if (y != 0.f && y != 2.f) {
-        LOG(fatal) << "Dead phi regions graph for layer " << name << " has invalid y value " << y << " at point " << i << ", should be 0 or 2";
+      static constexpr float EffValidLowValue = 0.f;
+      static constexpr float EffValidHighValue = 2.f;
+      if (y != EffValidLowValue && y != EffValidHighValue) {
+        LOG(fatal) << "Dead phi regions graph for layer " << mName << " has invalid y value " << y << " at point " << i << ", should be 0 or 2";
       }
     }
   } else {
-    LOG(info) << "Cleared dead phi regions for layer " << name;
+    LOG(info) << "Cleared dead phi regions for layer " << mName;
   }
 }
 
 std::string DetLayer::toString() const
 {
   std::string out = "";
   out.append("DetLayer: ");
-  out.append(name.Data());
+  out.append(mName.Data());
   out.append(" | r: ");
-  out.append(std::to_string(r));
+  out.append(std::to_string(mR));
   out.append(" cm | z: ");
-  out.append(std::to_string(z));
+  out.append(std::to_string(mZ));
   out.append(" cm | x0: ");
-  out.append(std::to_string(x0));
+  out.append(std::to_string(mX0));
   out.append(" cm | xrho: ");
-  out.append(std::to_string(xrho));
+  out.append(std::to_string(mXrho));
   out.append(" g/cm^3 | resRPhi: ");
-  out.append(std::to_string(resRPhi));
+  out.append(std::to_string(mResRPhi));
   out.append(" cm | resZ: ");
-  out.append(std::to_string(resZ));
+  out.append(std::to_string(mResZ));
   out.append(" cm | eff: ");
-  out.append(std::to_string(eff));
+  out.append(std::to_string(mEff));
   out.append(" | type: ");
-  switch (type) {
-    case layerInert:
+  switch (mType) {
+    case kLayerInert:
       out.append("Inert");
       break;
-    case layerSilicon:
+    case kLayerSilicon:
       out.append("Silicon");
       break;
-    case layerGas:
+    case kLayerGas:
       out.append("Gas/TPC");
       break;
+    case kLayerTOF:
+      out.append("TOF");
+      break;
+    case kLayerVertex:
+      out.append("Vertex");
+      break;
     default:
       out.append("Unknown");
       break;