Fix Specs.h and use that in geometry building

Author: mpuccio

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h

@@ -100,7 +100,7 @@ constexpr int nCols{static_cast<int>(length / chip::pitchZ)};
 
 namespace ML
 {
-constexpr int nLayers{3};                                 // number of layers in the ML
+constexpr int nLayers{5};                                 // number of layers in the ML
 constexpr double width{constants::moduleMLOT::width * 1}; // width of the stave
 // constexpr double length{constants::moduleMLOT::length * 10};                         // length of the stave
 constexpr double length{124 * cm};                                                   // length of the stave, hardcoded to fit the implemented geometry
@@ -118,7 +118,7 @@ constexpr double length{258 * cm};                                        // len
 constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)};  // number of rows in the halfstave
 constexpr int nCols{static_cast<int>(length / moduleMLOT::chip::pitchZ)}; // number of columns in the halfstave
 } // namespace halfstave
-constexpr int nLayers{5};                                                 // number of layers in the OT
+constexpr int nLayers{3};                                                 // number of layers in the OT
 constexpr double width{halfstave::width * 2};                             // width of the stave
 constexpr double length{halfstave::length};                               // length of the stave
 constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)};  // number of rows in the stave

Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx

@@ -12,6 +12,7 @@
 #include <TRKBase/GeometryTGeo.h>
 #include <TGeoManager.h>
 #include "TRKBase/SegmentationChip.h"
+#include "TRKBase/Specs.h"
 #include <TMath.h>
 
 #include <limits>
@@ -64,7 +65,7 @@ GeometryTGeo::GeometryTGeo(bool build, int loadTrans) : DetMatrixCache(detectors
 void GeometryTGeo::Build(int loadTrans)
 {
   ///// current geometry organization:
-  ///// total elements = x staves (*2 half staves if staggered geometry) * 8 layers ML+OT + 4 petal cases * (3 layers + 6 disks)
+  ///// total elements = x staves (*2 half staves if staggered geometry) * ML+OT layers + 4 petal cases * (3 layers + 6 disks)
   ///// indexing from 0 to 35: VD petals -> layers -> disks
   ///// indexing from 36 to y: MLOT staves
 
@@ -1130,7 +1131,7 @@ void GeometryTGeo::Print(Option_t*) const
   std::cout << "Detector ID: " << sInstance.get()->getDetID() << std::endl;
 
   LOGF(info, "Summary of GeometryTGeo: %s", getName());
-  LOGF(info, "Number of layers ML + OL: %d", mNumberOfLayersMLOT);
+  LOGF(info, "Number of layers ML + OT: %d", mNumberOfLayersMLOT);
   LOGF(info, "Number of active parts VD: %d", mNumberOfActivePartsVD);
   LOGF(info, "Number of layers VD: %d", mNumberOfLayersVD);
   LOGF(info, "Number of petals VD: %d", mNumberOfPetalsVD);
@@ -1142,7 +1143,7 @@ void GeometryTGeo::Print(Option_t*) const
   LOGF(info, "Number of staves and half staves per layer MLOT: ");
   for (int i = 0; i < mNumberOfLayersMLOT; i++) {
     std::string mlot = "";
-    mlot = (i < 4) ? "ML" : "OT";
+    mlot = (i < constants::ML::nLayers) ? "ML" : "OT";
     LOGF(info, "Layer: %d, %s, %d staves, %d half staves per stave", i, mlot.c_str(), mNumberOfStaves[i], mNumberOfHalfStaves[i]);
   }
   LOGF(info, "Number of modules per stave (half stave) in each ML(OT) layer: ");

Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx

@@ -13,6 +13,7 @@
 
 #include "DetectorsBase/Stack.h"
 
+#include "TRKBase/Specs.h"
 #include "TRKBase/TRKBaseParam.h"
 #include "TRKSimulation/Hit.h"
 #include "TRKSimulation/VDGeometryBuilder.h"
@@ -99,7 +100,7 @@ void Detector::configMLOT()
     case kCylindrical: {
       const std::vector<float> length{128.35f, 128.35f, 128.35f, 128.35f, 128.35f, 256.7f, 256.7f, 256.7f};
       LOGP(warning, "Loading cylindrical configuration for ALICE3 TRK");
-      for (int i{0}; i < 8; ++i) {
+      for (int i{0}; i < constants::ML::nLayers + constants::OT::nLayers; ++i) {
         std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(i);
         mLayers.push_back(std::make_unique<TRKCylindricalLayer>(i, name, rInn[i], length[i], thick, MatBudgetParamMode::Thickness));
       }
@@ -115,9 +116,9 @@ void Detector::configMLOT()
       const std::vector<float> stagOffsets{0.f, 0.f, 0.f, 1.17f, 0.89f};
 
       LOGP(warning, "Loading segmented configuration for ALICE3 TRK");
-      for (int i{0}; i < 8; ++i) {
+      for (int i{0}; i < constants::ML::nLayers + constants::OT::nLayers; ++i) {
         std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(i);
-        if (i < 5) {
+        if (i < constants::ML::nLayers) {
           mLayers.push_back(std::make_unique<TRKMLLayer>(i, name, rInn[i], stagOffsets[i], tiltAngles[i], nStaves[i], nMods[i], thick, MatBudgetParamMode::Thickness));
         } else {
           mLayers.push_back(std::make_unique<TRKOTLayer>(i, name, rInn[i], tiltAngles[i], nStaves[i], nMods[i], thick, MatBudgetParamMode::Thickness));
@@ -202,8 +203,8 @@ void Detector::configFromFile(std::string fileName)
         // Default mode is Thickness
         MatBudgetParamMode mode = MatBudgetParamMode::Thickness;
 
-        if (layerCount < 5) {
-          // ML layers (0 to 4) require stagOffset (index 5)
+        if (layerCount < constants::ML::nLayers) {
+          // ML layers require stagOffset (index 5)
           if (tmpBuff.size() < 6) {
             LOGP(fatal, "Invalid configuration for ML layer {}: stagOffset is missing.", layerCount);
           }
@@ -215,7 +216,7 @@ void Detector::configFromFile(std::string fileName)
 
           mLayers.push_back(std::make_unique<TRKMLLayer>(layerCount, name, rInn, stagOffset, tiltAngle, nStaves, nMods, thick, mode));
         } else {
-          // OT layers (5+) do NOT have stagOffset. The optional mode is at index 5.
+          // OT layers do NOT have stagOffset. The optional mode is at index 5.
           if (tmpBuff.size() >= 6) {
             mode = static_cast<MatBudgetParamMode>(static_cast<int>(tmpBuff[5]));
           }