Ft3 tiling bugfixing & module feature update (#15409)

* Change to tolerance based cutting in FT3 for both ML and OT to ensure no overlaps

* Change inner radius of services for ML to 38.5cm in line with scoping docs

* Add output to DEBUG and INFO about the number of module stack heights use, and change tiling starting point option to use a module instead of sensor. Also update a few outdated comments

* Change naming conventions in FT3 for kSegmentedStave: direction now before layer. Also number sensors (and other materials between it and the stave) within stave.

* add second circle for maximum radius

* Please consider the following formatting changes

---------

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>

Author: JustusRudolph

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

@@ -40,12 +40,14 @@ struct FT3BaseParam : public o2::conf::ConfigurableParamHelper<FT3BaseParam> {
   Float_t etaOut = 1.5;
   Float_t Layerx2X0 = 0.01;
 
-  // override values from FT3ModuleConstants, inner and outer
-  bool cutStavesOnNominalRadius_inner = true;
-  bool cutStavesOnNominalRadius_outer = true;
-
-  // What to place over x=0 line in case of full outer-outer stave: Gap or Sensor
-  bool placeSensorInMiddleOfStave = false;
+  // define tolerance allowed for staves to go outside nominal radii
+  double staveTolMLInner = 0.;
+  double staveTolMLOuter = 0.;
+  double staveTolOTInner = 0.;
+  double staveTolOTOuter = 0.;
+
+  // What to place over x=0 line in case of full outer-outer stave: Gap or Module
+  bool placeSensorStackInMiddleOfStave = false;
 
   // Draw reference circles at inner and outer radius of stave layer, for visualisation
   bool drawReferenceCircles = false;

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

@@ -81,26 +81,26 @@ class FT3Module
     std::pair<double, double>& absAllowedYRange,
     double x_mid, double y_mid, double z_stave_shift_forward);
   void addDetectorVolume(
-    TGeoVolume* motherVolume, std::string volumeName, int color, unsigned* volume_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 stave_idx,
-    unsigned* volume_count, double x_mid, double y_mid, double z_mid,
+    unsigned volume_count, double x_mid, double y_mid, double z_mid,
     std::string element_glued_to);
 
   void add2x1CopperVolume(
     TGeoVolume* motherVolume, int layerNumber, int direction, unsigned stave_idx,
-    unsigned* volume_count, double x_mid, double y_mid, double z_mid);
+    unsigned volume_count, double x_mid, double y_mid, double z_mid);
 
   void add2x1KaptonVolume(
     TGeoVolume* motherVolume, int layerNumber, int direction, unsigned stave_idx,
-    unsigned* volume_count, double x_mid, double y_mid, double z_mid);
+    unsigned volume_count, double x_mid, double y_mid, double z_mid);
 
   void addSingleSensorVolume(
     TGeoVolume* motherVolume, int layerNumber, int direction, unsigned stave_idx,
-    unsigned* volume_count, double active_x_mid, double y_mid, double z_mid, bool isLeft);
+    unsigned volume_count, double active_x_mid, double y_mid, double z_mid, bool isLeft);
 };
 
 #endif // FT3MODULE_H

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

@@ -23,7 +23,7 @@
 namespace o2::ft3::ModuleConstants
 {
 /* CURRENT STATUS:
- * 25x32mm sensors, 2mm inactive on one side
+ * 25x29mm sensors, 2mm inactive on one side
  * Most granular layout is 2x1 sensors, where the one on the right has the inactive region
  * on the right, and the one on the left has the inactive region on the left.
  * When stacking 2x1 modules, there is a 0.2mm gap between them. By default, we assume this
@@ -35,7 +35,7 @@ namespace o2::ft3::ModuleConstants
  * | |        |        | |
  * | |        |        | |
  * | |        |        | |
- * | |        |        | |  32mm sensor height
+ * | |        |        | |  29mm sensor height
  * | |        |        | |
  * | |        |        | |
  * ------------------------
@@ -105,8 +105,9 @@ const int CuColor = kOrange;
 const int kaptonColor = kYellow;
 const int carbonFiberColor = kGray + 1;
 
-// Struct for stave position configuration (varies between IT/OT)
+// Struct for stave position configuration (varies between ML/OT)
 struct StaveConfig {
+  const unsigned isML; // whether this config is for ML or OT
   /*
    * Constants for staves are written for both positive
    * and negative x even though they are just mirrored now,
@@ -123,7 +124,10 @@ struct StaveConfig {
   // lengths of staves, their midpoint, and their face
   const std::vector<double>& y_lengths;
   const std::vector<double>& x_midpoints;
-  double x_midpoint_spacing;
+  const double x_midpoint_spacing;
+  // whether staves can be placed outside of nominal radii
+  const double maxToleranceInner;
+  const double maxToleranceOuter;
   // which side of the disc do we place the stave?
   // kSegmentedStave: staggering staves in z (see z_offsetStave)
   // accessed via stave index, NOT stave ID
@@ -149,6 +153,8 @@ const std::vector<double> x_midpoints = {
   38.25, 42.75, 47.25, 51.75, 56.25, 60.75, 65.25               // R
 };
 const double x_midpoint_spacing = 4.5; // assume constant for now
+const double maxToleranceInner = 0.;   // default not allowed inwards
+const double maxToleranceOuter = 3.4;  // leave 1mm for layer air encapsulation
 const std::vector<bool> staveOnFront =
   {
     1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, // L
@@ -174,6 +180,8 @@ const std::vector<double> x_midpoints = {
   2.25, 6.75, 11.25, 15.75, 20.25, 24.75, 29.25, 33.75          // R
 };
 const double x_midpoint_spacing = 4.5;
+const double maxToleranceInner = 0.;  // default not allowed inwards
+const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation
 const std::vector<bool> staveOnFront =
   {
     1, 0, 1, 0, 1, 0, 1, 0, // L
@@ -186,17 +194,23 @@ inline StaveConfig getStaveConfig(bool isInnerDisk)
 {
   if (isInnerDisk) {
     return StaveConfig{
+      true, // isML
       ML_StavePositions::staveID_to_y_midpoint,
       ML_StavePositions::y_lengths,
       ML_StavePositions::x_midpoints,
       ML_StavePositions::x_midpoint_spacing,
+      ML_StavePositions::maxToleranceInner,
+      ML_StavePositions::maxToleranceOuter,
       ML_StavePositions::staveOnFront};
   } else {
     return StaveConfig{
+      false, // isML
       OT_StavePositions::staveID_to_y_midpoint,
       OT_StavePositions::y_lengths,
       OT_StavePositions::x_midpoints,
       OT_StavePositions::x_midpoint_spacing,
+      OT_StavePositions::maxToleranceInner,
+      OT_StavePositions::maxToleranceOuter,
       OT_StavePositions::staveOnFront};
   }
 }

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

@@ -630,9 +630,9 @@ void Detector::defineSensitiveVolumes()
       std::string sig2 = "FT3Sensor_front_" + std::to_string(iLayer) + "_" + std::to_string(direction);
       std::string sig3 = "FT3Sensor_back_" + std::to_string(iLayer) + "_" + std::to_string(direction);
 
-      // 3. SegmentedStave (format: FT3Sensor_<layer>_<dir>_...)
+      // 3. SegmentedStave (format: FT3Sensor_<dir>_<layer>_...)
       // Add the trailing underscore to avoid confusing it with sig1
-      std::string sig4 = "FT3Sensor_" + std::to_string(iLayer) + "_" + std::to_string(direction) + "_";
+      std::string sig4 = "FT3Sensor_" + std::to_string(direction) + "_" + std::to_string(iLayer) + "_";
 
       // Iterate over all existing volumes to find matches
       for (int i = 0; i < nVolumes; ++i) {

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

@@ -233,17 +233,21 @@ void FT3Layer::createReferenceCircles(TGeoVolume* motherVolume, const std::strin
   // create reference circles at the inner and outer radius of the layer, for visualization purposes
   TGeoTube* innerCircle = new TGeoTube(mInnerRadius - 0.1, mInnerRadius + 0.1, 0.01);
   TGeoTube* outerCircle = new TGeoTube(mOuterRadius - 0.1, mOuterRadius + 0.1, 0.01);
+  TGeoTube* outerCircleEdge = new TGeoTube(mOuterRadius + 3.3, mOuterRadius + 3.5, 0.01);
 
   TGeoVolume* innerCircleVol = new TGeoVolume((mLayerName + "_InnerCircle").c_str(), innerCircle, gGeoManager->GetMedium("FT3_AIR$"));
   TGeoVolume* outerCircleVol = new TGeoVolume((mLayerName + "_OuterCircle").c_str(), outerCircle, gGeoManager->GetMedium("FT3_AIR$"));
+  TGeoVolume* outerCircleEdgeVol = new TGeoVolume((mLayerName + "_OuterCircleEdge").c_str(), outerCircleEdge, gGeoManager->GetMedium("FT3_AIR$"));
 
   innerCircleVol->SetLineColor(kRed);
   outerCircleVol->SetLineColor(kBlue);
+  outerCircleEdgeVol->SetLineColor(kBlack);
 
   double z_position = mDirection ? 0.5 : -0.5;
 
   motherVolume->AddNode(innerCircleVol, 1, new TGeoTranslation(0, 0, z_position));
   motherVolume->AddNode(outerCircleVol, 1, new TGeoTranslation(0, 0, z_position));
+  motherVolume->AddNode(outerCircleEdgeVol, 1, new TGeoTranslation(0, 0, z_position));
 }
 
 void FT3Layer::createLayer(TGeoVolume* motherVolume)
@@ -459,7 +463,9 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
 
     // shift stave volumes into layer volume, since nominal z_{stave face} = 0
     double z_local_offset = z_layer_thickness / 2.0;
-    TGeoTube* layer = new TGeoTube(mInnerRadius - 0.2, mOuterRadius + 2.5, z_layer_thickness / 2); // margins to ensure staves are fully encapsulated in the layer volume
+    // ensure staves fully encapsulated in the layer volume,
+    // but don't cross out of max nominal radii of 38.5cm & 71.5cm respectively (3.5cm tolerance)
+    TGeoTube* layer = new TGeoTube(mInnerRadius - 0.2, mOuterRadius + 3.49, z_layer_thickness / 2);
     layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
 
     if (ft3Params.drawReferenceCircles) {