Merge branch 'AliceO2Group:master' into master

Author: arvindkhuntia

.github/workflows/labeler.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Label the PR
         id: labeler
-        uses: actions/labeler@v5
+        uses: actions/labeler@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           sync-labels: true

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

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         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.'

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/Core/DetLayer.cxx

@@ -16,11 +16,14 @@
 /// \brief  Basic struct to hold information regarding a detector layer to be used in fast simulation
 ///
 
-#include <vector>
-#include <string>
-
 #include "DetLayer.h"
 
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Logger.h>
+
+#include <string>
+#include <vector>
+
 namespace o2::fastsim
 {
 
@@ -51,6 +54,62 @@ DetLayer::DetLayer(const DetLayer& other)
 {
 }
 
+void DetLayer::addDeadPhiRegion(float phiStart, float phiEnd)
+{
+  static constexpr float kDefaultValue = 2.f;
+  static constexpr float kPhiTolerance = 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);
+  }
+  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;
+    return;
+  }
+  mDeadPhiRegions->AddPoint(phiStart, kDefaultValue);
+  mDeadPhiRegions->AddPoint(phiEnd, kDefaultValue);
+  mDeadPhiRegions->AddPoint(phiStart + kPhiTolerance, 0.f);
+  mDeadPhiRegions->AddPoint(phiEnd - kPhiTolerance, 0.f);
+  mDeadPhiRegions->Sort();
+}
+
+void DetLayer::setDeadPhiRegions(TGraph* graph)
+{
+  LOG(debug) << "Setting dead phi regions for layer " << name << " with graph " << (graph ? graph->GetName() : "nullptr");
+  if (mDeadPhiRegions != nullptr) {
+    LOG(warning) << "Overriding existing dead phi regions for layer " << name;
+    delete mDeadPhiRegions;
+  }
+  mDeadPhiRegions = graph;
+  if (mDeadPhiRegions->GetN() == 0) {
+    LOG(warning) << "Dead phi regions graph for layer " << name << " is empty, clearing dead regions";
+    mDeadPhiRegions = nullptr;
+    return; // cleared the dead regions
+  }
+  // Check sanity of the graph
+  if (mDeadPhiRegions != nullptr) {
+    for (int i = 0; i < mDeadPhiRegions->GetN(); i++) {
+      const float x = mDeadPhiRegions->GetX()[i];
+      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(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;
+      }
+      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";
+      }
+    }
+  } else {
+    LOG(info) << "Cleared dead phi regions for layer " << name;
+  }
+}
+
 std::string DetLayer::toString() const
 {
   std::string out = "";

ALICE3/Core/DetLayer.h

@@ -19,9 +19,10 @@
 #ifndef ALICE3_CORE_DETLAYER_H_
 #define ALICE3_CORE_DETLAYER_H_
 
-#include <string>
+#include <TGraph.h>
+#include <TString.h>
 
-#include "TString.h"
+#include <string>
 
 namespace o2::fastsim
 {
@@ -47,6 +48,17 @@ struct DetLayer {
   void setEfficiency(float eff_) { eff = eff_; }
   void setType(int type_) { type = type_; }
 
+  // Dead areas
+
+  /// @brief Add a dead region in phi for this layer
+  /// @param phiStart starting angle in radians of the dead region
+  /// @param phiEnd ending angle in radians of the dead region
+  void addDeadPhiRegion(float phiStart, float phiEnd);
+
+  /// @brief Set the dead regions in phi for this layer with a TGraph containing all regions. The graph should have y=2 for dead regions and y=0 for alive regions.
+  /// @param graph graph of the dead regions. Can be nullptr to clear the dead regions.
+  void setDeadPhiRegions(TGraph* graph);
+
   // Getters
   float getRadius() const { return r; }
   float getZ() const { return z; }
@@ -57,6 +69,7 @@ struct DetLayer {
   float getEfficiency() const { return eff; }
   int getType() const { return type; }
   const TString& getName() const { return name; }
+  const TGraph* getDeadPhiRegions() const { return mDeadPhiRegions; }
 
   // Check layer type
   bool isInert() const { return type == layerInert; }
@@ -70,6 +83,15 @@ struct DetLayer {
     os << layer.toString();
     return os;
   }
+  /// @brief Check if a given phi angle is in a dead region
+  /// @param phi The phi angle to check
+  /// @return True if the phi angle is in a dead region, false otherwise
+  bool isInDeadPhiRegion(float phi) const
+  {
+    if (mDeadPhiRegions == nullptr)
+      return false;
+    return mDeadPhiRegions->Eval(phi) > 1.f;
+  };
 
  private:
   // TString for holding name
@@ -90,6 +112,9 @@ struct DetLayer {
   // efficiency
   float eff; // detection efficiency
 
+  // dead regions in phi (in radians)
+  TGraph* mDeadPhiRegions = nullptr;
+
   // layer type
   int type;                              // 0: undefined/inert, 1: silicon, 2: gas/tpc
   static constexpr int layerInert = 0;   // inert/undefined layer