Merge branch 'AliceO2Group:master' into master

Author: prottayCMT

.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

@@ -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/

.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;
@@ -166,9 +167,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);
@@ -290,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:

ALICE3/Core/FastTracker.cxx

@@ -11,15 +11,18 @@
 
 #include "FastTracker.h"
 
-#include "ReconstructionDataFormats/TrackParametrization.h"
+#include "Common/Core/TableHelper.h"
+
+#include <ReconstructionDataFormats/TrackParametrization.h>
 
-#include "TMath.h"
-#include "TMatrixD.h"
-#include "TMatrixDSymEigen.h"
-#include "TRandom.h"
 #include <TEnv.h>
 #include <THashList.h>
+#include <TMath.h>
+#include <TMatrixD.h>
+#include <TMatrixDSymEigen.h>
 #include <TObject.h>
+#include <TRandom.h>
+#include <TSystem.h>
 
 #include <fstream>
 #include <map>
@@ -31,6 +34,81 @@ namespace o2
 namespace fastsim
 {
 
+std::map<std::string, std::map<std::string, std::string>> GeometryContainer::parseTEnvConfiguration(std::string filename, std::vector<std::string>& layers)
+{
+  std::map<std::string, std::map<std::string, std::string>> configMap;
+  filename = gSystem->ExpandPathName(filename.c_str());
+  TEnv env(filename.c_str());
+  THashList* table = env.GetTable();
+  layers.clear();
+  for (int i = 0; i < table->GetEntries(); ++i) {
+    const std::string key = table->At(i)->GetName();
+    // key should contain exactly one dot
+    if (key.find('.') == std::string::npos || key.find('.') != key.rfind('.')) {
+      LOG(fatal) << "Key " << key << " does not contain exactly one dot";
+      continue;
+    }
+    const std::string firstPart = key.substr(0, key.find('.'));
+    if (std::find(layers.begin(), layers.end(), firstPart) == layers.end()) {
+      layers.push_back(firstPart);
+    }
+  }
+  env.Print();
+  // Layers
+  for (const auto& layer : layers) {
+    LOG(info) << " Reading layer " << layer;
+    for (int i = 0; i < table->GetEntries(); ++i) {
+      const std::string key = table->At(i)->GetName();
+      if (key.find(layer + ".") == 0) {
+        const std::string paramName = key.substr(key.find('.') + 1);
+        const std::string value = env.GetValue(key.c_str(), "");
+        configMap[layer][paramName] = value;
+      }
+    }
+  }
+  return configMap;
+}
+
+void GeometryContainer::init(o2::framework::InitContext& initContext)
+{
+  std::vector<std::string> detectorConfiguration;
+  const bool found = common::core::getTaskOptionValue(initContext, "on-the-fly-detector-geometry-provider", "detectorConfiguration", detectorConfiguration, false);
+  if (!found) {
+    LOG(fatal) << "Could not retrieve detector configuration from OnTheFlyDetectorGeometryProvider task.";
+    return;
+  }
+  LOG(info) << "Size of detector configuration: " << detectorConfiguration.size();
+  for (const auto& configFile : detectorConfiguration) {
+    LOG(info) << "Detector geometry configuration file used: " << configFile;
+    addEntry(configFile);
+  }
+}
+
+std::map<std::string, std::string> GeometryContainer::GeometryEntry::getConfiguration(const std::string& layerName) const
+{
+  auto it = mConfigurations.find(layerName);
+  if (it != mConfigurations.end()) {
+    return it->second;
+  } else {
+    LOG(fatal) << "Layer " << layerName << " not found in geometry configurations.";
+    return {};
+  }
+}
+
+std::string GeometryContainer::GeometryEntry::getValue(const std::string& layerName, const std::string& key, bool require) const
+{
+  auto layer = getConfiguration(layerName);
+  auto entry = layer.find(key);
+  if (entry != layer.end()) {
+    return layer.at(key);
+  } else if (require) {
+    LOG(fatal) << "Key " << key << " not found in layer " << layerName << " configurations.";
+    return "";
+  } else {
+    return "";
+  }
+}
+
 // +-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+
 
 DetLayer* FastTracker::AddLayer(TString name, float r, float z, float x0, float xrho, float resRPhi, float resZ, float eff, int type)
@@ -236,81 +314,33 @@ void FastTracker::AddTPC(float phiResMean, float zResMean)
   }
 }
 
-void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBManager* ccdbManager)
+void FastTracker::AddGenericDetector(GeometryContainer::GeometryEntry configMap, o2::ccdb::BasicCCDBManager* ccdbManager)
 {
-  LOG(info) << " Adding generic detector from file " << filename;
-  // If the filename starts with ccdb: then take the file from the ccdb
-  if (filename.rfind("ccdb:", 0) == 0) {
-    std::string ccdbPath = filename.substr(5); // remove "ccdb:" prefix
-    if (ccdbManager == nullptr) {
-      LOG(fatal) << "CCDB manager is null, cannot retrieve file " << ccdbPath;
-      return;
-    }
-    const std::string outPath = "/tmp/DetGeo/";
-    filename = Form("%s/%s/snapshot.root", outPath.c_str(), ccdbPath.c_str());
-    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 detector geometry " << filename;
-      std::map<std::string, std::string> metadata;
-      ccdbManager->getCCDBAccessor().retrieveBlob(ccdbPath, outPath, metadata, 1);
-      // Add CCDB handling logic here if needed
-      LOG(info) << " --- Now retrieving geometry configuration from CCDB to: " << filename;
-    } else { // File exists, proceed to load
-      LOG(info) << " --- Geometry configuration file already exists: " << filename << ". Skipping download.";
-      checkFile.close();
-    }
-    AddGenericDetector(filename, nullptr);
-    return;
-  }
-
-  TEnv env(filename.c_str());
-  THashList* table = env.GetTable();
-  std::vector<std::string> layers;
-  for (int i = 0; i < table->GetEntries(); ++i) {
-    const std::string key = table->At(i)->GetName();
-    // key should contain exactly one dot
-    if (key.find('.') == std::string::npos || key.find('.') != key.rfind('.')) {
-      LOG(fatal) << "Key " << key << " does not contain exactly one dot";
+  // Layers
+  for (const auto& layer : configMap.getLayerNames()) {
+    if (layer.find("global") != std::string::npos) { // Layers with global tag are skipped
+      LOG(info) << " Skipping global configuration entry " << layer;
       continue;
     }
-    const std::string firstPart = key.substr(0, key.find('.'));
-    if (std::find(layers.begin(), layers.end(), firstPart) == layers.end()) {
-      layers.push_back(firstPart);
-    }
-  }
-  // env.Print();
-  // Layers
-  for (const auto& layer : layers) {
-    LOG(info) << " Reading layer " << layer;
 
-    auto getKey = [&layer, &env](const std::string& name, const bool required = true) {
-      std::string key = layer + "." + name;
-      if (!env.Defined(key.c_str())) {
-        if (required) {
-          LOG(fatal) << "Key " << key << " not defined in configuration file";
-        }
-        LOG(debug) << "Key " << key << " not defined in configuration file, getting the default value";
-      }
-      LOG(debug) << " Getting key " << key << " from configuration file";
-      return key;
-    };
-    const float r = env.GetValue(getKey("r").c_str(), -1.0f);
+    LOG(info) << " Reading layer " << layer;
+    const float r = configMap.getFloatValue(layer, "r");
     LOG(info) << " Layer " << layer << " has radius " << r;
-    const float z = env.GetValue(getKey("z").c_str(), -1.0f);
-    const float x0 = env.GetValue(getKey("x0").c_str(), 0.0f);
-    const float xrho = env.GetValue(getKey("xrho").c_str(), 0.0f);
-    const float resRPhi = env.GetValue(getKey("resRPhi").c_str(), 0.0f);
-    const float resZ = env.GetValue(getKey("resZ").c_str(), 0.0f);
-    const float eff = env.GetValue(getKey("eff").c_str(), 0.0f);
-    const int type = env.GetValue(getKey("type").c_str(), 0);
-    const char* deadPhiRegions = env.GetValue(getKey("deadPhiRegions", false).c_str(), "");
+    const float z = configMap.getFloatValue(layer, "z");
+    const float x0 = configMap.getFloatValue(layer, "x0");
+    const float xrho = configMap.getFloatValue(layer, "xrho");
+    const float resRPhi = configMap.getFloatValue(layer, "resRPhi");
+    const float resZ = configMap.getFloatValue(layer, "resZ");
+    const float eff = configMap.getFloatValue(layer, "eff");
+    const int type = configMap.getIntValue(layer, "type");
+    const std::string deadPhiRegions = configMap.getValue(layer, "deadPhiRegions", false);
 
     // void AddLayer(TString name, float r, float z, float x0, float xrho, float resRPhi = 0.0f, float resZ = 0.0f, float eff = 0.0f, int type = 0);
     LOG(info) << " Adding layer " << layer << " r=" << r << " z=" << z << " x0=" << x0 << " xrho=" << xrho << " resRPhi=" << resRPhi << " resZ=" << resZ << " eff=" << eff << " type=" << type << " deadPhiRegions=" << deadPhiRegions;
 
     DetLayer* addedLayer = AddLayer(layer.c_str(), r, z, x0, xrho, resRPhi, resZ, eff, type);
-    if (strlen(deadPhiRegions) > 0) { // Taking it as ccdb path or local file
-                                      // Check if it begins with ccdb:
+    if (!deadPhiRegions.empty()) { // Taking it as ccdb path or local file
+                                   // Check if it begins with ccdb:
       if (std::string(deadPhiRegions).rfind("ccdb:", 0) == 0) {
         std::string ccdbPath = std::string(deadPhiRegions).substr(5); // remove "ccdb:" prefix
         if (ccdbManager == nullptr) {
@@ -321,7 +351,7 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
         addedLayer->setDeadPhiRegions(g);
       } else {
         // Taking it as local file
-        TFile infile(deadPhiRegions, "READ");
+        TFile infile(deadPhiRegions.c_str(), "READ");
         if (!infile.IsOpen()) {
           LOG(fatal) << "Cannot open dead phi regions file " << deadPhiRegions;
           return;