Give new geometry creation an FT3Layout enum and change Layer&Module accordingly. Also simplify create_layout_scopingV3 function since the layout_type isn't needed.

Author: JustusRudolph

Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h

@@ -24,10 +24,12 @@ enum eFT3Layout {
   kCylindrical = 0,
   kTrapezoidal,
   kSegmented,
+  kSegmentedMarch26,
+  kSegmentedStave,
 };
 struct FT3BaseParam : public o2::conf::ConfigurableParamHelper<FT3BaseParam> {
   // Geometry Builder parameters
-  eFT3Layout layoutFT3 = kSegmented;
+  eFT3Layout layoutFT3 = kSegmentedMarch26;
   int nTrapezoidalSegments = 32; // for the simple trapezoidal disks
 
   // FT3Geometry::Telescope parameters

Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3Module.h

@@ -25,7 +25,7 @@
 using PositionType = std::pair<double, unsigned>;
 using PositionTypes = std::vector<PositionType>;
 using PosNegPositionTypes = std::pair<PositionTypes, PositionTypes>;
-namespace Constants = FT3ModuleConstants;
+namespace Constants = o2::ft3::ModuleConstants;
 
 class FT3Module
 {
@@ -52,8 +52,7 @@ class FT3Module
 
   void createModule_scopingV3(
     double mZ, int layerNumber, int direction, double Rin,
-    double Rout, double overlap,
-    const std::string& layout_type, TGeoVolume* motherVolume);
+    double Rout, double overlap, TGeoVolume* motherVolume);
 
  private:
   static void create_layout(
@@ -63,8 +62,7 @@ class FT3Module
 
   void create_layout_scopingV3(
     double mZ, int layerNumber, int direction, double Rin,
-    double Rout, double overlap,
-    const std::string& layout_type, TGeoVolume* motherVolume);
+    double Rout, double overlap, TGeoVolume* motherVolume);
 
   // Helper functions
   void fill_stave(PosNegPositionTypes& y_positions, double Rout,

Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h

@@ -19,7 +19,7 @@
 #include <map>
 #include <TColor.h>
 
-namespace FT3ModuleConstants
+namespace o2::ft3::ModuleConstants
 {
   /* CURRENT STATUS:
    * 25x32mm sensors, 2mm inactive on one side

Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx

@@ -381,7 +381,7 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
 
     LOG(info) << "Inserting " << layerVol->GetName() << " inside " << motherVolume->GetName();
     motherVolume->AddNode(layerVol, 1, FwdDiskCombiTrans);
-  } else if (ft3Params.layoutFT3 == kSegmented) {
+  } else if (ft3Params.layoutFT3 == kSegmented || ft3Params.layoutFT3 == kSegmentedMarch26) {
     FT3Module module;
 
     // layer structure
@@ -398,9 +398,15 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
     createSeparationLayer(layerVol, separationLayerName);
 
     // create disk faces
-    module.createModule(0, mLayerNumber, mDirection, mInnerRadius, mOuterRadius, 0., "front", "rectangular", layerVol);
-    module.createModule(0, mLayerNumber, mDirection, mInnerRadius, mOuterRadius, 0., "back", "rectangular", layerVol);
-
+    if (ft3Params.layoutFT3 == kSegmented) {
+      module.createModule(0, mLayerNumber, mDirection, mInnerRadius, mOuterRadius, 0., "front", "rectangular", layerVol);
+      module.createModule(0, mLayerNumber, mDirection, mInnerRadius, mOuterRadius, 0., "back", "rectangular", layerVol);
+    } else if (ft3Params.layoutFT3 == kSegmentedMarch26) {
+      module.createModule_scopingV3(0, mLayerNumber, mDirection, mInnerRadius,
+                                    mOuterRadius, 0., layerVol);
+      module.createModule_scopingV3(0, mLayerNumber, mDirection, mInnerRadius,
+                                    mOuterRadius, 0., layerVol);
+    }
     // Finally put everything in the mother volume
     auto* FwdDiskRotation = new TGeoRotation("FwdDiskRotation", 0, 0, 180);
     auto* FwdDiskCombiTrans = new TGeoCombiTrans(0, 0, mZ, FwdDiskRotation);

Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx

@@ -308,7 +308,7 @@ void FT3Module::addSingleSensorVolume(
 
 void FT3Module::create_layout_scopingV3(double mZ, int layerNumber, int direction,
                                         double Rin, double Rout, double overlap,
-                                        const std::string& layout_type, TGeoVolume* motherVolume)
+                                        TGeoVolume* motherVolume)
 {
   LOG(info) << "FT3Module: create_layout_scopingV3 - Layer "
             << layerNumber << ", Direction " << direction;
@@ -1096,10 +1096,9 @@ void FT3Module::createModule(double mZ, int layerNumber, int direction, double R
 
 void FT3Module::createModule_scopingV3(double mZ, int layerNumber, int direction,
                                        double Rin, double Rout, double overlap,
-                                       const std::string& layout_type,
                                        TGeoVolume* motherVolume) {
   LOG(debug) << "FT3Module: createModule_scopingV3 - Layer " << layerNumber
              << ", Direction " << direction;
-  create_layout_scopingV3(mZ, layerNumber, direction, Rin, Rout, overlap, layout_type, motherVolume);
+  create_layout_scopingV3(mZ, layerNumber, direction, Rin, Rout, overlap, motherVolume);
   LOG(debug) << "FT3Module: done createModule_scopingV3";
 }