Add carbon fiber material, functionality to toggle between stave and old geometry. Also rename material counts to 'volume' instead of 'sensor'. EDIT: Change TGeo layer thickness back to original. EDIT2: Change Middle layer disc usage to newly added segmentation.

Author: JustusRudolph

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

@@ -42,6 +42,8 @@ class FT3Module
   static TGeoMedium* epoxyMed;
   static TGeoMaterial* AluminumMat;
   static TGeoMedium* AluminumMed;
+  static TGeoMaterial* carbonFiberMat;
+  static TGeoMedium* carbonFiberMed;
 
   const char* mDetName;
 
@@ -52,7 +54,8 @@ class FT3Module
 
   void createModule_scopingV3(
     double mZ, int layerNumber, int direction, double Rin,
-    double Rout, double overlap, TGeoVolume* motherVolume);
+    double Rout, double overlap, TGeoVolume* motherVolume,
+    bool useStaves);
 
  private:
   static void create_layout(
@@ -62,32 +65,37 @@ class FT3Module
 
   void create_layout_scopingV3(
     double mZ, int layerNumber, int direction, double Rin,
-    double Rout, double overlap, TGeoVolume* motherVolume);
+    double Rout, double overlap, TGeoVolume* motherVolume,
+    bool useStaves);
 
   // Helper functions
   void fill_stave(PosNegPositionTypes& y_positions, double Rout,
                   double x_left, unsigned kSensorStack, double tolerance,
                   std::pair<double, double> y_start);
+  void addStaveVolume(
+    TGeoVolume* motherVolume, std::string volumeName, int direction,
+    unsigned* volume_count, double staveLength,
+    double x_mid, double y_mid, double z_stave_shift_abs);
   void addDetectorVolume(
-    TGeoVolume* motherVolume, std::string volumeName, int color, unsigned* sensor_count,
+    TGeoVolume* motherVolume, std::string volumeName, int color, unsigned* volume_count,
     double x_mid, double y_mid, double z_mid,
     double x_half_length, double y_half_length, double z_half_length);
 
   void add2x1GlueVolume(
-    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* sensor_count,
+    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* volume_count,
     std::string side_str, double x_mid, double y_mid, double z_mid,
     std::string element_glued_to);
 
   void add2x1CopperVolume(
-    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* sensor_count,
+    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* volume_count,
     std::string side_str, double x_mid, double y_mid, double z_mid);
 
   void add2x1KaptonVolume(
-    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* sensor_count,
+    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* volume_count,
     std::string side_str, double x_mid, double y_mid, double z_mid);
 
   void addSingleSensorVolume(
-    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* sensor_count,
+    TGeoVolume* motherVolume, int layerNumber, int direction, unsigned* volume_count,
     double active_x_mid, double y_mid, double z_mid, std::string side_str, bool isLeft);
 };
 

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

@@ -234,7 +234,9 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
     LOG(fatal) << "Invalid layer number " << mLayerNumber << " for FT3 layer.";
   }
 
-  LOG(info) << "FT3: ft3Params.layoutFT3 = " << ft3Params.layoutFT3;
+  LOG(info) << "FT3: ft3Params.layoutFT3 = " << ft3Params.layoutFT3
+            << " Creating Layer " << mLayerNumber << " at z=" << mZ
+            << " with direction " << mDirection;
 
   // ### options for ML and OT disk layout
   if (ft3Params.layoutFT3 == kTrapezoidal /*|| (mIsMiddleLayer && ft3Params.layoutFT3 == kSegmented)*/) {
@@ -381,7 +383,9 @@ 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 == kSegmentedMarch26 ||
+             ft3Params.layoutFT3 == kSegmentedStave) {
     FT3Module module;
 
     // layer structure
@@ -402,10 +406,11 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
       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);
+      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);
     }
     // Finally put everything in the mother volume
     auto* FwdDiskRotation = new TGeoRotation("FwdDiskRotation", 0, 0, 180);