Improve order

Author: njacazio

ALICE3/Core/FastTracker.cxx

@@ -15,11 +15,14 @@
 
 #include "ReconstructionDataFormats/TrackParametrization.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,41 @@ 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;

ALICE3/Core/FastTracker.h

@@ -19,11 +19,6 @@
 #include <Framework/Logger.h>
 #include <ReconstructionDataFormats/Track.h>
 
-#include <TEnv.h>
-#include <THashList.h>
-#include <TObject.h>
-#include <TSystem.h>
-
 #include <map>
 #include <string>
 #include <vector>
@@ -44,66 +39,30 @@ class GeometryContainer
   /**
    * @brief Parses a TEnv configuration file and returns the key-value pairs split per entry
    * @param filename Path to the TEnv configuration file
+   * @param layers Vector to store the order of the layers as they appear in the file
    * @return A map where each key is a layer name and the value is another map of key-value pairs for that layer
    */
-  static std::map<std::string, std::map<std::string, std::string>> parseTEnvConfiguration(std::string filename)
-  {
-    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();
-    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";
-        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;
-  }
+  static std::map<std::string, std::map<std::string, std::string>> parseTEnvConfiguration(std::string filename, std::vector<std::string>& layers);
+
+  // A container for the geometry info
   struct GeometryEntry {
     // Default constructor
     GeometryEntry() = default;
     explicit GeometryEntry(std::string filename) : name(filename)
     {
-      mConfigurations = GeometryContainer::parseTEnvConfiguration(filename);
+      mConfigurations = GeometryContainer::parseTEnvConfiguration(filename, layerNames);
     }
     std::map<std::string, std::map<std::string, std::string>> getConfigurations() const { return mConfigurations; }
     std::map<std::string, std::string> getConfiguration(const std::string& layerName) const;
-    std::vector<std::string> getLayerNames() const
-    {
-      std::vector<std::string> layerNames;
-      for (const auto& layer : mConfigurations) {
-        layerNames.push_back(layer.first);
-      }
-      return layerNames;
-    }
+    std::vector<std::string> getLayerNames() const { return layerNames; }
     std::string getValue(const std::string& layerName, const std::string& key, bool require = true) const;
     float getFloatValue(const std::string& layerName, const std::string& key) const { return std::stof(getValue(layerName, key)); }
     int getIntValue(const std::string& layerName, const std::string& key) const { return std::stoi(getValue(layerName, key)); }
 
    private:
     std::string name; // Filename of the geometry
     std::map<std::string, std::map<std::string, std::string>> mConfigurations;
+    std::vector<std::string> layerNames; // Ordered names of the layers
   };
 
   void addEntry(const std::string& filename) { entries.emplace_back(filename); }