wip(iris): import stash-pre-rebase changes

(cherry picked from commit d291e57a2f121c4f19f1fb7ccd8031328abc9ce8)

Author: plariono

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

@@ -42,12 +42,15 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
   };
   static const char* getTRKVolPattern() { return sVolumeName.c_str(); }
   static const char* getTRKLayerPattern() { return sLayerName.c_str(); }
+  static const char* getVDLayerPattern() { return sVDLayerName.c_str(); }
+  static const char* getVDDiskPattern() { return sVDDiskName.c_str(); }
   static const char* getTRKPetalPattern() { return sPetalName.c_str(); }
   static const char* getTRKPetalDiskPattern() { return sPetalDiskName.c_str(); }
   static const char* getTRKPetalLayerPattern() { return sPetalLayerName.c_str(); }
   static const char* getTRKStavePattern() { return sStaveName.c_str(); }
   static const char* getTRKChipPattern() { return sChipName.c_str(); }
   static const char* getTRKSensorPattern() { return sSensorName.c_str(); }
+  static const char* getVDSensorPattern() { return sVDSensorName.c_str(); }
   static const char* getTRKWrapVolPattern() { return sWrapperVolumeName.c_str(); }
 
   int getNumberOfChips() const { return mSize; }
@@ -141,6 +144,9 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   static std::string sVolumeName;
   static std::string sLayerName;
+  static std::string sVDLayerName;
+  static std::string sVDDiskName;
+  static std::string sVDSensorName;
   static std::string sPetalName;
   static std::string sPetalDiskName;
   static std::string sPetalLayerName;

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

@@ -24,12 +24,16 @@ std::unique_ptr<o2::trk::GeometryTGeo> GeometryTGeo::sInstance;
 // Names
 std::string GeometryTGeo::sVolumeName = "TRKV";
 std::string GeometryTGeo::sLayerName = "TRKLayer";
-std::string GeometryTGeo::sPetalName = "PETALCASE";
 std::string GeometryTGeo::sPetalDiskName = "DISK";
 std::string GeometryTGeo::sPetalLayerName = "LAYER";
 std::string GeometryTGeo::sStaveName = "TRKStave";
 std::string GeometryTGeo::sChipName = "TRKChip";
 std::string GeometryTGeo::sSensorName = "TRKSensor";
+
+std::string GeometryTGeo::sPetalName = "Petal";
+std::string GeometryTGeo::sVDLayerName = "Layer";
+std::string GeometryTGeo::sVDDiskName = "Disk";
+std::string GeometryTGeo::sVDSensorName = "VDSensor";
 std::string GeometryTGeo::sWrapperVolumeName = "TRKUWrapVol"; ///< Wrapper volume name, not implemented at the moment
 
 o2::trk::GeometryTGeo::~GeometryTGeo()

Detectors/Upgrades/ALICE3/TRK/simulation/CMakeLists.txt

@@ -21,6 +21,8 @@ o2_add_library(TRKSimulation
                        src/TRKPetalCase.cxx
                        src/TRKPetalLayer.cxx
                        src/TRKPetalDisk.cxx
+                       src/VDLayer.cxx
+                       src/VDGeometryBuilder.cxx
                PUBLIC_LINK_LIBRARIES O2::TRKBase
                                      O2::FT3Simulation
                                      O2::ITSMFTSimulation
@@ -38,4 +40,6 @@ o2_target_root_dictionary(TRKSimulation
                                   include/TRKSimulation/TRKPetalCase.h
                                   include/TRKSimulation/TRKPetalLayer.h
                                   include/TRKSimulation/TRKPetalDisk.h
+                                  include/TRKSimulation/VDLayer.h
+                                  include/TRKSimulation/VDGeometryBuilder.h
                                   include/TRKSimulation/DPLDigitizerParam.h)

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

@@ -71,7 +71,7 @@ class Detector : public o2::base::DetImpl<Detector>
   }
 
   void configDefault();
-  void buildTRKNewVacuumVessel();
+  void buildTRKMiddleOuterLayers();
   void configFromFile(std::string fileName = "alice3_TRK_layout.txt");
   void configToFile(std::string fileName = "alice3_TRK_layout.txt");
 

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

@@ -0,0 +1,35 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef O2_TRK_VDGEOMETRYBUILDER_H
+#define O2_TRK_VDGEOMETRYBUILDER_H
+
+class TGeoVolume;
+
+#include <string>
+#include <vector>
+
+namespace o2::trk
+{
+
+// Build full VD for each design.
+// Each function builds one local petal assembly (walls + layers + disks)
+// and then places/rotates the petal once into the mother volume.
+
+void createIRIS4Geometry(TGeoVolume* motherVolume);  // 4 petals, cylindrical L0
+void createIRIS4aGeometry(TGeoVolume* motherVolume); // 3 petals, cylindrical L0
+void createIRIS5Geometry(TGeoVolume* motherVolume);  // 4 petals, rectangular L0
+
+void createSinglePetalDebug(TGeoVolume* motherVolume, int petalID = 0, int nPetals = 4, bool rectangularL0 = false);
+
+} // namespace o2::trk
+
+#endif // O2_TRK_VDGEOMETRYBUILDER_H

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

@@ -0,0 +1,110 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef ALICEO2_VD_LAYER_H
+#define ALICEO2_VD_LAYER_H
+
+#include <string>
+#include <Rtypes.h>
+
+class TGeoVolume;
+class TGeoMatrix;
+
+namespace o2
+{
+namespace trk
+{
+
+// Base class for a VD layer
+class VDLayer
+{
+ public:
+  VDLayer() = default;
+  VDLayer(int layerNumber, const std::string& layerName, double layerX2X0);
+  virtual ~VDLayer() = default;
+
+  // Create the layer (AIR container + sensors) and insert it into mother
+  virtual void createLayer(TGeoVolume* motherVolume, TGeoMatrix* combiTrans = nullptr) const = 0;
+
+  double getChipThickness() const { return mChipThickness; }
+
+ protected:
+  int mLayerNumber{0};
+  std::string mLayerName;
+  double mX2X0{0.f};          // Radiation length in units of X0
+  double mChipThickness{0.f}; // thickness derived from X/X0
+  double mModuleWidth{4.54f}; // cm
+
+  // ClassDef(VDLayer, 1)
+};
+
+// Cylindrical segment layer
+class VDCylindricalLayer : public VDLayer
+{
+ public:
+  VDCylindricalLayer(int layerNumber, const std::string& layerName, double layerX2X0,
+                     double radius, double phiSpanDeg, double lengthZ, double lengthSensZ);
+
+  TGeoVolume* createSensor() const; // builds the sensor volume
+  void createLayer(TGeoVolume* motherVolume, TGeoMatrix* combiTrans = nullptr) const override;
+
+ private:
+  double mRadius{0.f};
+  double mPhiSpanDeg{0.f};  // degrees
+  double mLengthZ{0.f};     // layer container length in Z
+  double mLengthSensZ{0.f}; // sensor length in Z
+
+  // ClassDef(VDCylindricalLayer, 1)
+};
+
+// Rectangular segment layer
+class VDRectangularLayer : public VDLayer
+{
+ public:
+  VDRectangularLayer(int layerNumber, const std::string& layerName, double layerX2X0,
+                     double width, double lengthZ, double lengthSensZ);
+
+  TGeoVolume* createSensor() const;
+  void createLayer(TGeoVolume* motherVolume, TGeoMatrix* combiTrans = nullptr) const override;
+
+ private:
+  double mWidth{0.f};
+  double mLengthZ{0.f};
+  double mLengthSensZ{0.f};
+
+  // ClassDef(VDRectangularLayer, 1)
+};
+
+// Disk segment layer
+class VDDiskLayer : public VDLayer
+{
+ public:
+  VDDiskLayer(int layerNumber, const std::string& layerName, double layerX2X0,
+              double rMin, double rMax, double phiSpanDeg, double zPos);
+
+  TGeoVolume* createSensor() const;
+  void createLayer(TGeoVolume* motherVolume, TGeoMatrix* combiTrans = nullptr) const override;
+
+  double getZPosition() const { return mZPos; }
+
+ private:
+  double mRMin{0.f};
+  double mRMax{0.f};
+  double mPhiSpanDeg{0.f}; // degrees
+  double mZPos{0.f};       // placement along Z
+
+  // ClassDef(VDDiskLayer, 1)
+};
+
+} // namespace trk
+} // namespace o2
+
+#endif // ALICEO2_VD_LAYER_H

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

@@ -0,0 +1,27 @@
+#ifndef O2_TRK_VDSENSORREGISTRY_H
+#define O2_TRK_VDSENSORREGISTRY_H
+
+#include <string>
+#include <vector>
+
+namespace o2::trk
+{
+
+struct VDSensorDesc {
+  enum class Kind { Barrel,
+                    Disk };
+  std::string name; // sensor volume name
+  int petal = -1;
+  Kind kind = Kind::Barrel;
+  int idx = -1; // layer or disk index
+};
+
+// Accessor (defined in VDGeometryBuilder.cxx)
+std::vector<VDSensorDesc>& vdSensorRegistry();
+
+// Utilities (defined in VDGeometryBuilder.cxx)
+void clearVDSensorRegistry();
+void registerSensor(const std::string& volName, int petal, VDSensorDesc::Kind kind, int idx);
+
+} // namespace o2::trk
+#endif

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

@@ -19,13 +19,16 @@
 #include "ITSMFTSimulation/Hit.h"
 #include "TRKSimulation/Detector.h"
 #include "TRKBase/TRKBaseParam.h"
+#include "TRKSimulation/VDGeometryBuilder.h"
+#include "TRKSimulation/VDSensorRegistry.h"
 
 using o2::itsmft::Hit;
 
 namespace o2
 {
 namespace trk
 {
+
 float getDetLengthFromEta(const float eta, const float radius)
 {
   return 2. * (10. + radius * std::cos(2 * std::atan(std::exp(-eta))));
@@ -48,7 +51,7 @@ Detector::Detector(bool active)
   if (trkPars.configFile != "") {
     configFromFile(trkPars.configFile);
   } else {
-    buildTRKNewVacuumVessel();
+    buildTRKMiddleOuterLayers();
     configToFile();
     configServices();
   }
@@ -115,7 +118,7 @@ void Detector::configDefault()
   mLayers.emplace_back(7, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(7)}, 80.f, 258.f, 100.e-3);
 }
 
-void Detector::buildTRKNewVacuumVessel()
+void Detector::buildTRKMiddleOuterLayers()
 {
   // Build the TRK detector according to changes proposed during
   // https://indico.cern.ch/event/1407704/
@@ -125,9 +128,6 @@ void Detector::buildTRKNewVacuumVessel()
   mLayers.clear();
 
   LOGP(warning, "Loading \"After Upgrade Days March 2024\" configuration for ALICE3 TRK");
-  // mLayers.emplace_back(0, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(0)}, 0.5f, 50.f, 100.e-4);
-  // mLayers.emplace_back(1, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(1)}, 1.2f, 50.f, 100.e-4);
-  // mLayers.emplace_back(2, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(2)}, 2.5f, 50.f, 100.e-4);
   mLayers.emplace_back(0, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(0)}, 7.f, 124.f, 100.e-3);
   LOGP(info, "TRKLayer created. Name: {}", std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(0)});
   mLayers.emplace_back(1, std::string{GeometryTGeo::getTRKLayerPattern() + std::to_string(1)}, 9.f, 124.f, 100.e-3);
@@ -260,13 +260,16 @@ void Detector::createGeometry()
 
   // Add service for inner tracker
   mServices.createServices(vTRK);
-  mPetalCases.clear();
-  // Add petal cases (the sensitive layers inside the petal cases get constructed here too)
-  auto& trkPars = TRKBaseParam::Instance();
-  for (Int_t petalCaseNumber = 0; petalCaseNumber < sNumberVDPetalCases; ++petalCaseNumber) {
-    mPetalCases.emplace_back(petalCaseNumber, vTRK, trkPars.irisOpen);
-    mServices.excavateFromVacuum(mPetalCases[petalCaseNumber].getFullName());
-  }
+
+  // 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(vVD); createIRIS4aGeometry(vVD);
+  o2::trk::createIRIS4Geometry(vTRK);
+
+  mServices.excavateFromVacuum("IRIS_CUTOUTsh");
   mServices.registerVacuum(vTRK);
 }
 
@@ -291,26 +294,18 @@ void Detector::defineSensitiveVolumes()
   TString volumeName;
   LOGP(info, "Adding TRK Sensitive Volumes");
 
-  // Add petal case sensitive volumes
-  for (int petalCase = 0; petalCase < sNumberVDPetalCases; ++petalCase) {
-    // Petal layers
-    for (int petalLayer = 0; petalLayer < mPetalCases[petalCase].mPetalLayers.size(); ++petalLayer) {
-      volumeName = mPetalCases[petalCase].mPetalLayers[petalLayer].getSensorName();
-      if (petalLayer == 0) {
-        mFirstOrLastLayers.push_back(volumeName.Data());
-      }
-      LOGP(info, "Trying {}", volumeName.Data());
-      v = geoManager->GetVolume(volumeName.Data());
-      LOGP(info, "Adding TRK Sensitive Volume {}", v->GetName());
-      AddSensitiveVolume(v);
+  // Register VD sensors created by VDGeometryBuilder
+  for (const auto& s : o2::trk::vdSensorRegistry()) {
+    TGeoVolume* v = gGeoManager->GetVolume(s.name.c_str());
+    if (!v) {
+      LOGP(warning, "VD sensor volume '{}' not found", s.name);
+      continue;
     }
-    // Petal disks
-    for (int petalDisk = 0; petalDisk < mPetalCases[petalCase].mPetalDisks.size(); ++petalDisk) {
-      volumeName = mPetalCases[petalCase].mPetalDisks[petalDisk].getSensorName();
-      LOGP(info, "Trying {}", volumeName.Data());
-      v = geoManager->GetVolume(volumeName.Data());
-      LOGP(info, "Adding TRK Sensitive Volume {}", v->GetName());
-      AddSensitiveVolume(v);
+    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*/)) {
+      mFirstOrLastLayers.push_back(s.name);
     }
   }
 

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

@@ -173,7 +173,9 @@ void TRKServices::registerVacuum(TGeoVolume* motherVolume)
   TGeoVolume* vacuumVolume = new TGeoVolume("A3IP_VACUUM", vacuumComposite, kMedVac);
 
   // Add the vacuum to the barrel
-  vacuumVolume->SetLineColor(kGreen - 3);
+  vacuumVolume->SetLineColor(kAzure + 7);
+  vacuumVolume->SetTransparency(80);
+  
   motherVolume->AddNode(vacuumVolume, 1, new TGeoTranslation(0, 0, 0));
 }
 

Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKSimulationLinkDef.h

@@ -19,6 +19,7 @@
 #pragma link C++ class o2::trk::TRKLayer + ;
 #pragma link C++ class o2::trk::TRKPetalLayer + ;
 #pragma link C++ class o2::trk::TRKPetalDisk + ;
+#pragma link C++ class o2::trk::VDLayer + ;
 #pragma link C++ class o2::trk::TRKServices + ;
 #pragma link C++ class o2::trk::Detector + ;
 #pragma link C++ class o2::base::DetImpl < o2::trk::Detector> + ;