add new optimised tiling to FT3ModuleConstants. Now has active coverage area of 97.25% in the nominal region

Author: JustusRudolph

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

@@ -48,8 +48,8 @@ namespace o2::ft3::ModuleConstants
 const double single_sensor_width = 2.5;
 const double single_sensor_height = 2.9;
 const double inactive_width = 0.2;
-const double sensor2x1_gap = 0.02;     // both between L&R sensors in 2x1, and between two 2x1s
-const double stackGap = sensor2x1_gap; // gap between 2xN module stacks
+const double sensor2x1_gap = 0.015;    // between L&R sensors in 2x1, and between sensors in a stack
+const double stackGap = 0.035;         // gap between 2xN module stacks
 
 const double active_width = single_sensor_width - inactive_width;
 const double active_height = single_sensor_height;
@@ -189,28 +189,26 @@ namespace OT_StavePositions
  * Do NOT add any zero midpoints, this is taken off separately.
  */
 const std::map<int, std::pair<double, bool>> staveID_to_y_midpoint = {
-  {-5, {32.73, true}},
-  {-4, {38.609, true}},
-  {-3, {42.094, true}},
-  {-2, {43.023, true}},
-  {-1, {44.054, true}},
-  {1, {44.053, true}},
-  {2, {43.023, true}},
-  {3, {42.094, true}},
-  {4, {38.609, true}},
-  {5, {32.73, true}}};
+  {-4, {39.679, true}},
+  {-3, {42.065, true}},
+  {-2, {42.991, true}},
+  {-1, {43.772, true}},
+  {1, {43.772, true}},
+  {2, {42.991, true}},
+  {3, {42.065, true}},
+  {4, {39.679, true}}};
 /*
  * Length of one stave piece: for a stave in staveID_to_y_midpoint that is one
  * of its two pieces, otherwise the whole stave centred on y=0. Sized to cover
  * the modules in exactStaveFills, with 1 mm of margin.
  */
 const std::vector<double> y_lengths = {
-  40.87, 61.31, 78.83, 90.51, 99.27,
-  108.03, 113.87, 119.71, 122.63, 128.47,
-  64.23, 55.47, 49.63, 49.63, 47.23,
-  47.23, 49.63, 49.63, 55.47, 64.23,
-  128.47, 122.63, 119.71, 113.87, 108.03,
-  99.27, 90.51, 78.83, 61.31, 40.87};
+  41, 61.35, 73.03, 87.63, 96.39,
+  105.14, 110.99, 116.82, 122.67, 125.58,
+  128.5, 52.59, 49.67, 49.67, 46.78,
+  46.78, 49.67, 49.67, 52.59, 128.5,
+  125.58, 122.67, 116.82, 110.99, 105.14,
+  96.39, 87.63, 73.03, 61.35, 41};
 const unsigned nStaves = 30; // y_lengths, staveOnFront and exactStaveFills follow this
 const double x_midpoint_spacing = 4.5;
 const std::vector<double> x_midpoints = makeStaveXMidpoints(nStaves, x_midpoint_spacing);
@@ -227,36 +225,36 @@ const std::vector<bool> staveOnFront = makeStaveOnFront(nStaves);
  * because FT3 puts a stackGap between modules and the optimiser does not.
  */
 const std::vector<std::vector<StaveFill>> exactStaveFills = {
-  {{-20.43, {4, 4, 3, 3}}}, // ID -15
+  {{-20.476, {4, 4, 3, 3}}}, // ID -15
   {{-30.65, {4, 4, 4, 3, 3, 3}}}, // ID -14
-  {{-39.41, {4, 4, 4, 4, 4, 4, 3}}}, // ID -13
-  {{-45.25, {4, 4, 4, 4, 4, 4, 4, 3}}}, // ID -12
-  {{-49.63, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -11
-  {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID -10
-  {{-56.93, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID -9
-  {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID -8
-  {{-61.31, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -7
-  {{-64.23, {4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}}}, // ID -6
-  {{-64.84, {4, 4, 4, 4, 3, 3}}, {0.62, {4, 4, 4, 4, 3, 3}}}, // ID -5
-  {{-66.339, {4, 4, 4, 4, 3}}, {10.879, {4, 4, 4, 4, 3}}}, // ID -4
-  {{-66.904, {4, 4, 3, 3, 3}}, {17.284, {4, 4, 3, 3, 3}}}, // ID -3
-  {{-67.833, {4, 4, 3, 3, 3}}, {18.213, {4, 4, 3, 3, 3}}}, // ID -2
-  {{-67.147, {4, 3, 3, 3, 3}}, {20.96, {4, 3, 3, 3, 3}}}, // ID -1
-  {{-67.66, {4, 3, 3, 3, 3}}, {20.447, {4, 3, 3, 3, 3}}}, // ID +1
-  {{-67.833, {4, 4, 3, 3, 3}}, {18.213, {4, 4, 3, 3, 3}}}, // ID +2
-  {{-66.904, {4, 4, 3, 3, 3}}, {17.284, {4, 4, 3, 3, 3}}}, // ID +3
-  {{-66.339, {4, 4, 4, 4, 3}}, {10.879, {4, 4, 4, 4, 3}}}, // ID +4
-  {{-64.84, {4, 4, 4, 4, 3, 3}}, {0.62, {4, 4, 4, 4, 3, 3}}}, // ID +5
-  {{-64.23, {4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}}}, // ID +6
-  {{-61.31, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +7
-  {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +8
-  {{-56.93, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID +9
-  {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +10
-  {{-49.63, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +11
-  {{-45.25, {4, 4, 4, 4, 4, 4, 4, 3}}}, // ID +12
-  {{-39.41, {4, 4, 4, 4, 4, 4, 3}}}, // ID +13
+  {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID -13
+  {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -12
+  {{-48.17, {4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID -11
+  {{-52.5425, {4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID -10
+  {{-55.4675, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -9
+  {{-58.3825, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID -8
+  {{-61.3075, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -7
+  {{-62.765, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID -6
+  {{-64.2225, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID -5
+  {{-65.946, {4, 4, 4, 3, 3}}, {13.411, {4, 4, 4, 3, 3}}}, // ID -4
+  {{-66.8749, {4, 4, 3, 3, 3}}, {17.2549, {4, 4, 3, 3, 3}}}, // ID -3
+  {{-67.8015, {4, 4, 3, 3, 3}}, {18.1815, {4, 4, 3, 3, 3}}}, // ID -2
+  {{-67.1397, {4, 4, 4, 4}}, {20.4051, {4, 4, 4, 4}}}, // ID -1
+  {{-67.0901, {4, 4, 4, 4}}, {20.4547, {4, 4, 4, 4}}}, // ID +1
+  {{-67.8015, {4, 4, 3, 3, 3}}, {18.1815, {4, 4, 3, 3, 3}}}, // ID +2
+  {{-66.8749, {4, 4, 3, 3, 3}}, {17.2549, {4, 4, 3, 3, 3}}}, // ID +3
+  {{-65.946, {4, 4, 4, 3, 3}}, {13.411, {4, 4, 4, 3, 3}}}, // ID +4
+  {{-64.2225, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID +5
+  {{-62.765, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID +6
+  {{-61.3075, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +7
+  {{-58.3825, {4, 4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID +8
+  {{-55.4675, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +9
+  {{-52.5425, {4, 4, 4, 4, 4, 4, 4, 4, 4}}}, // ID +10
+  {{-48.17, {4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +11
+  {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +12
+  {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID +13
   {{-30.65, {4, 4, 4, 3, 3, 3}}}, // ID +14
-  {{-20.43, {4, 4, 3, 3}}}, // ID +15
+  {{-20.379, {4, 4, 3, 3}}}, // ID +15
 };
 } // namespace OT_StavePositions