Make Stave layout the standard and remove old kSegmentedMarch26: EDIT 20/04/26: Revert to newly added middle disc layer segmentation.

Author: JustusRudolph

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

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

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

@@ -383,8 +383,7 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
 
     LOG(info) << "Inserting " << layerVol->GetName() << " inside " << motherVolume->GetName();
     motherVolume->AddNode(layerVol, 1, FwdDiskCombiTrans);
-  } else if (ft3Params.layoutFT3 == kSegmented || 
-             ft3Params.layoutFT3 == kSegmentedMarch26 ||
+  } else if (ft3Params.layoutFT3 == kSegmented ||
              ft3Params.layoutFT3 == kSegmentedStave) {
     FT3Module module;
 
@@ -405,12 +404,9 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
     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, false);
     } else if (ft3Params.layoutFT3 == kSegmentedStave) {
       module.createModule_scopingV3(0., mLayerNumber, mDirection, mInnerRadius,
-                                    mOuterRadius, 0., layerVol, true);
+                                    mOuterRadius, 0., layerVol);
     }
     // Finally put everything in the mother volume
     auto* FwdDiskRotation = new TGeoRotation("FwdDiskRotation", 0, 0, 180);