U

Author: njacazio

ALICE3/Core/FastTracker.cxx

@@ -251,41 +251,14 @@ void FastTracker::AddTPC(float phiResMean, float zResMean)
   }
 }
 
-std::map<std::string, std::map<std::string, std::string>> FastTracker::parseTEnvConfiguration(std::string filename)
+void FastTracker::AddGenericDetector(std::map<std::string, std::map<std::string, std::string>> configMap, o2::ccdb::BasicCCDBManager* ccdbManager)
 {
-  return GeometryContainer::parseTEnvConfiguration(filename);
-}
-
-void FastTracker::AddGenericDetector(std::string filename, 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;
-  }
-
-  std::map<std::string, std::map<std::string, std::string>> configMap = parseTEnvConfiguration(filename);
   // Layers
   for (const auto& layer : configMap) {
+    if (layer.first.find("global") != std::string::npos) { // Layers with global tag are skipped
+      LOG(info) << " Skipping global configuration entry " << layer.first;
+      continue;
+    }
     LOG(info) << " Reading layer " << layer.first;
     const float r = std::stof(layer.second.at("r"));
     LOG(info) << " Layer " << layer.first << " has radius " << r;

ALICE3/Core/FastTracker.h

@@ -85,16 +85,16 @@ class GeometryContainer
     {
       mConfigurations = GeometryContainer::parseTEnvConfiguration(filename);
     }
+    std::map<std::string, std::map<std::string, std::string>> getConfigurations() const { return mConfigurations; }
 
    private:
     std::string name; // Filename of the geometry
     std::map<std::string, std::map<std::string, std::string>> mConfigurations;
   };
 
-  void addEntry(const std::string& filename)
-  {
-    entries.emplace_back(filename);
-  }
+  void addEntry(const std::string& filename) { entries.emplace_back(filename); }
+  const std::vector<GeometryEntry>& getEntries() const { return entries; }
+  const GeometryEntry& getEntry(const int id) const { return entries.at(id); }
 
  private:
   std::vector<GeometryEntry> entries;
@@ -142,24 +142,16 @@ class FastTracker
   void AddSiliconALICE3(float scaleX0VD, std::vector<float> pixelResolution);
   void AddTPC(float phiResMean, float zResMean);
 
-  /**
-   * @brief Parses a TEnv configuration file and returns the key-value pairs split per entry
-   * @param filename Path to the TEnv configuration file
-   * @return A map where each key is a layer name and the value is another map of key-value pairs for that layer
-   */
-  std::map<std::string, std::map<std::string, std::string>> parseTEnvConfiguration(std::string filename);
-
   /**
    * @brief Adds a generic detector configuration from the specified file.
    *
    * This function loads and integrates a detector configuration into the tracker
    * using the provided filename. The file should contain the necessary parameters
    * and settings for the detector to be added.
    *
-   * @param filename Path to the configuration file describing the detector.
-   * @param ccdbManager Pointer to a BasicCCDBManager instance for database access (if needed).
+   * @param configMap Configuration map describing the detector.
    */
-  void AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBManager* ccdbManager = nullptr);
+  void AddGenericDetector(std::map<std::string, std::map<std::string, std::string>> configMap, o2::ccdb::BasicCCDBManager* ccdbManager = nullptr);
 
   void Print();
 

ALICE3/TableProducer/OTF/onTheFlyDetectorGeometryProvider.cxx

@@ -22,6 +22,7 @@
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -30,10 +31,11 @@ struct OnTheFlyDetectorGeometryProvider {
   o2::framework::Configurable<std::vector<std::string>> detectorConfiguration{"detectorConfiguration",
                                                                               std::vector<std::string>{"a3geo.ini"},
                                                                               "Paths of the detector geometry configuration files"};
+  o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb;
   void init(o2::framework::InitContext&)
   {
-    // ccdb->setURL("http://alice-ccdb.cern.ch");
-    // ccdb->setTimestamp(-1);
+    ccdb->setURL("http://alice-ccdb.cern.ch");
+    ccdb->setTimestamp(-1);
   }
   void run(o2::framework::ProcessingContext& pc)
   {
@@ -45,6 +47,22 @@ struct OnTheFlyDetectorGeometryProvider {
     }
     for (const auto& configFile : detectorConfiguration.value) {
       LOG(info) << "Loading detector geometry from configuration file: " << configFile;
+      // If the filename starts with ccdb: then take the file from the ccdb
+      if (configFile.rfind("ccdb:", 0) == 0) {
+        std::string ccdbPath = configFile.substr(5); // remove "ccdb:" prefix
+        const std::string outPath = "/tmp/DetGeo/";
+        configFile = Form("%s/%s/snapshot.root", outPath.c_str(), ccdbPath.c_str());
+        std::ifstream checkFile(configFile); // Check if file already exists
+        if (!checkFile.is_open()) {          // File does not exist, retrieve from CCDB
+          LOG(info) << " --- CCDB source detected for detector geometry " << configFile;
+          std::map<std::string, std::string> metadata;
+          ccdb->getCCDBAccessor().retrieveBlob(ccdbPath, outPath, metadata, 1);
+          LOG(info) << " --- Now retrieving geometry configuration from CCDB to: " << configFile;
+        } else { // File exists, proceed to load
+          LOG(info) << " --- Geometry configuration file already exists: " << configFile << ". Skipping download.";
+          checkFile.close();
+        }
+      }
       geometryContainer.addEntry(configFile);
     }
     pc.services().get<o2::framework::ControlService>().endOfStream();

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -302,10 +302,12 @@ struct OnTheFlyTracker {
   TRandom3 rand;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
-  void init(o2::framework::InitContext&)
+  void init(o2::framework::InitContext& initContext)
   {
     ccdb->setURL("http://alice-ccdb.cern.ch");
     ccdb->setTimestamp(-1);
+    o2::fastsim::GeometryContainer geoContainer;
+    geoContainer.init(initContext);
 
     auto loadLUT = [&](int icfg, int pdg, const std::vector<std::string>& tables) {
       LOG(info) << "Loading LUT for pdg " << pdg << " for config " << icfg << " from provided tables with size " << tables.size();
@@ -403,7 +405,7 @@ struct OnTheFlyTracker {
         } else if (fastTrackerSettings.alice3geo.value[icfg] == "2") {
           fastTracker[icfg]->AddSiliconALICE3(fastTrackerSettings.scaleVD, fastTrackerSettings.pixelRes);
         } else {
-          fastTracker[icfg]->AddGenericDetector(fastTrackerSettings.alice3geo.value[icfg], ccdb.operator->());
+          fastTracker[icfg]->AddGenericDetector(geoContainer.getEntry(icfg).getConfigurations(), ccdb.operator->());
         }
         // print fastTracker settings
         fastTracker[icfg]->Print();
@@ -585,7 +587,7 @@ struct OnTheFlyTracker {
       } else if (fastPrimaryTrackerSettings.alice3geo.value == "2") {
         fastPrimaryTracker.AddSiliconALICE3(1., {0.00025, 0.00025, 0.001, 0.001});
       } else {
-        fastPrimaryTracker.AddGenericDetector(fastPrimaryTrackerSettings.alice3geo, ccdb.operator->());
+        fastTracker[icfg]->AddGenericDetector(geoContainer.getEntry(icfg).getConfigurations(), ccdb.operator->());
       }
 
       // print fastTracker settings