VD sensor names, num of vols using registry

Author: plariono

Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx

@@ -123,7 +123,7 @@ void Alice3Pipe::ConstructGeometry()
   barrel->AddNode(pipeVolume, 1, new TGeoTranslation(0, 30.f, 0));
 
   pipeVolume->SetLineColor(37);
-  pipeVolume->SetTransparency(10);
+  pipeVolume->SetTransparency(0);
 }
 
 void Alice3Pipe::createMaterials()

Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Detector.h

@@ -30,9 +30,6 @@ namespace trk
 class Detector : public o2::base::DetImpl<Detector>
 {
  public:
-  static constexpr Int_t mNumberOfVolumes = 44;   /// hardcoded for the current geometry = 8 MLOT layers + 36 volumes in the VD. TODO: automatize or change according to the current geometry
-  static constexpr Int_t mNumberOfVolumesVD = 36; /// hardcoded for the current geometry = 36 volumes in the VD. TODO: automatize or change according to the current geometry
-
   Detector(bool active);
   Detector();
   ~Detector();
@@ -79,6 +76,9 @@ class Detector : public o2::base::DetImpl<Detector>
   void createGeometry();
 
  private:
+  int mNumberOfVolumes;
+  int mNumberOfVolumesVD;
+
   // Transient data about track passing the sensor
   struct TrackData {
     bool mHitStarted;                  // hit creation started
@@ -90,7 +90,7 @@ class Detector : public o2::base::DetImpl<Detector>
   GeometryTGeo* mGeometryTGeo;         //!
   std::vector<o2::itsmft::Hit>* mHits; // ITSMFT ones for the moment
   std::vector<TRKLayer> mLayers;
-  TRKServices mServices;                 // Houses the services of the TRK, but not the Iris tracker
+  TRKServices mServices; // Houses the services of the TRK, but not the Iris tracker
 
   std::vector<std::string> mFirstOrLastLayers; // Names of the first or last layers
   bool InsideFirstOrLastLayer(std::string layerName);

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

@@ -56,28 +56,6 @@ Detector::Detector(bool active)
     configServices();
   }
 
-  mSensorName.resize(mNumberOfVolumes); // hardcoded. TODO: change size when a different naming scheme for VD is in place. Ideally could be 4 petals + 8 layers = 12
-  int VDvolume = 0;
-  for (int i = 0; i < 4; i++) { /// VD
-    for (int j = 0; j < 3; j++) {
-      mSensorName[VDvolume].Form("%s%d_%s%d_%s%d", GeometryTGeo::getTRKPetalPattern(), i, GeometryTGeo::getTRKPetalLayerPattern(), j, GeometryTGeo::getTRKSensorPattern(), j);
-      VDvolume++;
-    }
-    for (int j = 0; j < 6; j++) {
-      mSensorName[VDvolume].Form("%s%d_%s%d_%s%d", GeometryTGeo::getTRKPetalPattern(), i, GeometryTGeo::getTRKPetalDiskPattern(), j, GeometryTGeo::getTRKSensorPattern(), j);
-      VDvolume++;
-    }
-  }
-
-  for (int i = 0; i < 8; i++) { /// MLOT
-    mSensorName[VDvolume].Form("%s%d", GeometryTGeo::getTRKSensorPattern(), i);
-    VDvolume++;
-  }
-
-  for (auto vd : mSensorName) {
-    std::cout << "Volume name: " << vd << std::endl;
-  }
-
   LOGP(info, "Summary of TRK configuration:");
   for (auto& layer : mLayers) {
     LOGP(info, "Layer: {} name: {} r: {} cm | z: {} cm | thickness: {} cm", layer.getNumber(), layer.getName(), layer.getInnerRadius(), layer.getZ(), layer.getChipThickness());
@@ -262,13 +240,35 @@ void Detector::createGeometry()
   mServices.createServices(vTRK);
 
   // Build the VD using the petal builder
-  o2::trk::clearVDSensorRegistry();
-
   // Choose the VD design (here: IRIS4 by default).
   // You can wire this to a parameter in TRKBaseParam if desired.
   // Alternatives: createIRIS5Geometry(vTRK); createIRIS4aGeometry(vTRK);
+
+  o2::trk::clearVDSensorRegistry();
   o2::trk::createIRIS4Geometry(vTRK);
 
+  // Fill sensor names from registry right after geometry creation
+  const auto& regs = o2::trk::vdSensorRegistry();
+  mNumberOfVolumesVD = static_cast<int>(regs.size());
+  mNumberOfVolumes = mNumberOfVolumesVD + mLayers.size();
+  mSensorName.resize(mNumberOfVolumes);
+
+  // Fill VD sensor names from registry
+  int VDvolume = 0;
+  for (const auto& sensor : regs) {
+    mSensorName[VDvolume] = sensor.name;
+    VDvolume++;
+  }
+
+  // Add MLOT sensor names
+  for (int i = 0; i < mLayers.size(); i++) {
+    mSensorName[VDvolume++].Form("%s%d", GeometryTGeo::getTRKSensorPattern(), i);
+  }
+
+  for (auto vd : mSensorName) {
+    std::cout << "Volume name: " << vd << std::endl;
+  }
+
   mServices.excavateFromVacuum("IRIS_CUTOUTsh");
   mServices.registerVacuum(vTRK);
 }
@@ -304,7 +304,7 @@ void Detector::defineSensitiveVolumes()
     LOGP(info, "Adding VD Sensitive Volume {}", v->GetName());
     AddSensitiveVolume(v);
     // Optionally track first/last layers for TR references:
-    if (s.kind == o2::trk::VDSensorDesc::Kind::Barrel && (s.idx == 0 /*innermost*/)) {
+    if (s.region == o2::trk::VDSensorDesc::Region::Barrel && (s.idx == 0 /*innermost*/)) {
       mFirstOrLastLayers.push_back(s.name);
     }
   }

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

@@ -35,9 +35,9 @@ std::vector<VDSensorDesc>& vdSensorRegistry() { return gVDSensors; }
 
 void clearVDSensorRegistry() { gVDSensors.clear(); }
 
-void registerSensor(const std::string& volName, int petal, VDSensorDesc::Kind kind, int idx)
+void registerSensor(const std::string& volName, int petal, VDSensorDesc::Region region, VDSensorDesc::Type type, int idx)
 {
-  gVDSensors.push_back({volName, petal, kind, idx});
+  gVDSensors.push_back({volName, petal, region, type, idx});
 }
 
 static inline std::string makeSensorName(const std::string& layerName, int layerNumber)
@@ -208,7 +208,7 @@ inline void buildIrisCutoutFromPetalSolid(int nPetals)
 } // namespace
 
 // =================== Specs & constants (ROOT units: cm) ===================
-static constexpr double kX2X0 = 100.e-4f; // all silicon
+static constexpr double kX2X0 = 0.001f; // 0.1% X0 per layer
 static constexpr double kLenZ_cm = 50.0f; // L0/L1/L2 Z length
 
 // Radii (cm)
@@ -392,15 +392,15 @@ static void addBarrelLayers(TGeoVolume* petalAsm, int nPetals, int petalID, bool
 
     auto* tr = new TGeoCombiTrans(x, y, z, rot);
     L0.createLayer(petalAsm, tr);
+    registerSensor(makeSensorName(nameL0, 0), petalID, VDSensorDesc::Region::Barrel, VDSensorDesc::Type::Plane, /*idx*/ 0);
   } else {
     VDCylindricalLayer L0(0,
                           nameL0,
                           kX2X0, rL0_cm, phiL0_deg, kLenZ_cm, kLenZ_cm);
     L0.createLayer(petalAsm, nullptr);
+    registerSensor(makeSensorName(nameL0, 0), petalID, VDSensorDesc::Region::Barrel, VDSensorDesc::Type::Curved, /*idx*/ 0);
   }
 
-  registerSensor(makeSensorName(nameL0, 0), petalID, VDSensorDesc::Kind::Barrel, /*idx*/ 0);
-
   const std::string nameL1 =
     std::string(o2::trk::GeometryTGeo::getTRKPetalPattern()) + std::to_string(petalID) + "_" +
     std::string(o2::trk::GeometryTGeo::getTRKPetalLayerPattern()) + "1";
@@ -409,7 +409,7 @@ static void addBarrelLayers(TGeoVolume* petalAsm, int nPetals, int petalID, bool
                         nameL1,
                         kX2X0, rL1_cm, phiL1_deg, kLenZ_cm, kLenZ_cm);
   L1.createLayer(petalAsm, nullptr);
-  registerSensor(makeSensorName(nameL1, 1), petalID, VDSensorDesc::Kind::Barrel, /*idx*/ 1);
+  registerSensor(makeSensorName(nameL1, 1), petalID, VDSensorDesc::Region::Barrel, VDSensorDesc::Type::Curved, /*idx*/ 1);
 
   const std::string nameL2 =
     std::string(o2::trk::GeometryTGeo::getTRKPetalPattern()) + std::to_string(petalID) + "_" +
@@ -419,7 +419,7 @@ static void addBarrelLayers(TGeoVolume* petalAsm, int nPetals, int petalID, bool
                         nameL2,
                         kX2X0, rL2_cm, phiL2_deg, kLenZ_cm, kLenZ_cm);
   L2.createLayer(petalAsm, nullptr);
-  registerSensor(makeSensorName(nameL2, 2), petalID, VDSensorDesc::Kind::Barrel, /*idx*/ 2);
+  registerSensor(makeSensorName(nameL2, 2), petalID, VDSensorDesc::Region::Barrel, VDSensorDesc::Type::Curved, /*idx*/ 2);
 }
 
 // Build cold plate (cylindrical) in local coordinates, and add it to the petal assembly.
@@ -632,7 +632,7 @@ static void addDisks(TGeoVolume* petalAsm, int nPetals, int petalID)
     // Local Z placement only
     auto* tr = new TGeoTranslation(0.0, 0.0, static_cast<Double_t>(disk.getZPosition()));
     disk.createLayer(petalAsm, tr);
-    registerSensor(makeSensorName(nameD, i), petalID, VDSensorDesc::Kind::Disk, /*idx*/ i);
+    registerSensor(makeSensorName(nameD, i), petalID, VDSensorDesc::Region::Disk, VDSensorDesc::Type::Plane, /*idx*/ i);
   }
 }