From a6f28f8f51a2a3d9e040aaf872a6f9c39c171cc3 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 29 Sep 2026 15:03:28 +0000 Subject: [PATCH] Please consider the following formatting changes --- .../include/FT3Simulation/FT3Materials.h | 13 ++--- .../FT3Simulation/FT3ModuleConstants.h | 56 +++++++++---------- .../TRKFT3/FT3/simulation/src/FT3Layer.cxx | 2 +- .../FT3/simulation/src/FT3Materials.cxx | 1 - 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Materials.h b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Materials.h index 1d323dd6dfd04..06752bf267db1 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Materials.h +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Materials.h @@ -9,7 +9,6 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. - /// \file FT3Materials.h /// \brief Materials of the FT3 detector, and access to the media made from them @@ -71,17 +70,17 @@ using ComponentArray = std::array; struct MaterialProperties { const char* name; - int colour; // ROOT colour every volume made of this material is drawn in - float density; // g/cm3 + int colour; // ROOT colour every volume made of this material is drawn in + float density; // g/cm3 // Radiation and nuclear interaction length, cm. Only single elements carry // them: Mixture() derives both from the composition and takes no such // arguments. A non-positive value lets the transport engine compute it. float radl; float absl; - int nComponents; // 0: single element; > 0: mixture by weight; < 0: mixture by atom count - ComponentArray a; // mass numbers; only a[0] is used for a single element - ComponentArray z; // atomic numbers; only z[0] is used for a single element - ComponentArray w; // weight fractions or atom counts; unused for a single element + int nComponents; // 0: single element; > 0: mixture by weight; < 0: mixture by atom count + ComponentArray a; // mass numbers; only a[0] is used for a single element + ComponentArray z; // atomic numbers; only z[0] is used for a single element + ComponentArray w; // weight fractions or atom counts; unused for a single element TrackingParams tracking; }; diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h index e4c63deeeee72..c14d5fd42d719 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h +++ b/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.15; -const double sensor2x1_gap = 0.015; // gap between L&R sensors in 2x1, and between sensors in a stack -const double stackGap = 0.035; // gap between 2xN module stacks +const double sensor2x1_gap = 0.015; // gap 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; @@ -227,34 +227,34 @@ const std::vector staveOnFront = makeStaveOnFront(nStaves); * the bottom of the module the optimiser reports. */ const std::vector> exactStaveFills = { - {{-15.9953, {4, 4, 3}}}, // ID -14 - {{-29.1825, {4, 4, 4, 4, 4}}}, // ID -13 - {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID -12 - {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -11 - {{-49.6275, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -10 - {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID -9 - {{-56.925, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID -8 - {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 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 + {{-15.9953, {4, 4, 3}}}, // ID -14 + {{-29.1825, {4, 4, 4, 4, 4}}}, // ID -13 + {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID -12 + {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -11 + {{-49.6275, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID -10 + {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID -9 + {{-56.925, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID -8 + {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 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 {{-66.3087, {4, 4, 4, 3, 3, 3}}, {5.0087, {4, 4, 4, 3, 3, 3}}}, // ID -4 - {{-66.545, {4, 4, 3, 3, 3}}, {16.925, {4, 4, 3, 3, 3}}}, // ID -3 - {{-67.6917, {4, 4, 3, 3, 3}}, {18.0717, {4, 4, 3, 3, 3}}}, // ID -2 - {{-67.0542, {4, 4, 4, 4}}, {20.4669, {4, 4, 4, 4}}}, // ID -1 - {{-67.1519, {4, 4, 4, 4}}, {20.3692, {4, 4, 4, 4}}}, // ID +1 - {{-67.6917, {4, 4, 3, 3, 3}}, {18.0717, {4, 4, 3, 3, 3}}}, // ID +2 - {{-66.545, {4, 4, 3, 3, 3}}, {16.925, {4, 4, 3, 3, 3}}}, // ID +3 + {{-66.545, {4, 4, 3, 3, 3}}, {16.925, {4, 4, 3, 3, 3}}}, // ID -3 + {{-67.6917, {4, 4, 3, 3, 3}}, {18.0717, {4, 4, 3, 3, 3}}}, // ID -2 + {{-67.0542, {4, 4, 4, 4}}, {20.4669, {4, 4, 4, 4}}}, // ID -1 + {{-67.1519, {4, 4, 4, 4}}, {20.3692, {4, 4, 4, 4}}}, // ID +1 + {{-67.6917, {4, 4, 3, 3, 3}}, {18.0717, {4, 4, 3, 3, 3}}}, // ID +2 + {{-66.545, {4, 4, 3, 3, 3}}, {16.925, {4, 4, 3, 3, 3}}}, // ID +3 {{-66.3087, {4, 4, 4, 3, 3, 3}}, {5.0087, {4, 4, 4, 3, 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 - {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +7 - {{-56.925, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID +8 - {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +9 - {{-49.6275, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +10 - {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +11 - {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID +12 - {{-29.1825, {4, 4, 4, 4, 4}}}, // ID +13 - {{-16.0947, {4, 4, 3}}}, // ID +14 + {{-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 + {{-59.85, {4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +7 + {{-56.925, {4, 4, 4, 4, 4, 4, 4, 4, 4, 3}}}, // ID +8 + {{-54.01, {4, 4, 4, 4, 4, 4, 4, 3, 3, 3}}}, // ID +9 + {{-49.6275, {4, 4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +10 + {{-43.7875, {4, 4, 4, 4, 4, 4, 3, 3}}}, // ID +11 + {{-36.49, {4, 4, 4, 4, 3, 3, 3}}}, // ID +12 + {{-29.1825, {4, 4, 4, 4, 4}}}, // ID +13 + {{-16.0947, {4, 4, 3}}}, // ID +14 }; } // namespace OT_StavePositions diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx index fa8f278d875df..7205a0a15a4cb 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx @@ -424,7 +424,7 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume) // 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) // Allow 9cm inward for OT: - double innerRadiusForAirTube = mIsMiddleLayer ? mInnerRadius : mInnerRadius - 9.0; + double innerRadiusForAirTube = mIsMiddleLayer ? mInnerRadius : mInnerRadius - 9.0; // MvL: try 70.5 // 2.5 cm tolerance instead TGeoTube* layer = new TGeoTube(innerRadiusForAirTube - 0.2, mOuterRadius + 2.49, z_layer_thickness / 2); layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir); diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Materials.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Materials.cxx index 7d35a2d39beb5..4097af9d838bb 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Materials.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Materials.cxx @@ -9,7 +9,6 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. - /// \file FT3Materials.cxx /// \brief Access to the media created from the FT3 material map