From c47d4464605fb4487db220f6e1b185d175c72e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Fri, 10 Oct 2025 15:34:17 +0200 Subject: [PATCH 1/3] A3: Update FT3, add scoping version --- .../FT3/base/include/FT3Base/FT3BaseParam.h | 3 ++- .../ALICE3/FT3/simulation/src/Detector.cxx | 16 +++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h b/Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h index b286aa068611c..10299b5c8f73a 100644 --- a/Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h +++ b/Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h @@ -26,7 +26,8 @@ namespace ft3 enum FT3Geometry { Default = 0, - Telescope = 1 + Telescope = 1, + ScopingV3b = 2 }; struct FT3BaseParam : public o2::conf::ConfigurableParamHelper { diff --git a/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx b/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx index aab8ae070d936..9364f2dbc8d35 100644 --- a/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx +++ b/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx @@ -353,22 +353,16 @@ void Detector::buildFT3Scoping() LOG(info) << "Building FT3 Detector: Scoping document version"; - mNumberOfLayers = 12; + mNumberOfLayers = 6; float sensorThickness = 30.e-4; float layersx2X0 = 1.e-2; std::vector> layersConfig{ - {26., .5, 2.5, 0.1f * layersx2X0}, // {z_layer, r_in, r_out, Layerx2X0} - {30., .5, 2.5, 0.1f * layersx2X0}, - {34., .5, 2.5, 0.1f * layersx2X0}, {77., 5.0, 35., layersx2X0}, {100., 5.0, 35., layersx2X0}, {122., 5.0, 35., layersx2X0}, {150., 5.0, 68.f, layersx2X0}, {180., 5.0, 68.f, layersx2X0}, - {220., 5.0, 68.f, layersx2X0}, - {260., 5.0, 68.f, layersx2X0}, - {300., 5.0, 68.f, layersx2X0}, - {350., 5.0, 68.f, layersx2X0}}; + {220., 5.0, 68.f, layersx2X0}}; mLayerName.resize(2); mLayerName[0].resize(mNumberOfLayers); @@ -407,8 +401,9 @@ Detector::Detector(bool active) if (ft3BaseParam.configFile != "") { LOG(info) << "FT3 Geometry configuration file provided. Overriding FT3Base.geoModel configuration."; buildFT3FromFile(ft3BaseParam.configFile); - + } else { + LOG(info) << "FT3 Geometry configuration file not provided. Using FT3Base.geoModel " << ft3BaseParam.geoModel << " configuration."; switch (ft3BaseParam.geoModel) { case Default: buildFT3NewVacuumVessel(); // FT3 after Upgrade days March 2024 @@ -416,6 +411,9 @@ Detector::Detector(bool active) case Telescope: buildBasicFT3(ft3BaseParam); // BasicFT3 = Parametrized telescopic detector (equidistant layers) break; + case ScopingV3b: + buildFT3Scoping(); // FT3 according to scoping document + break; default: LOG(fatal) << "Invalid Geometry.\n"; break; From 67433dbfbe4190ae70aa92aba9822b41cede241f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Jacazio?= Date: Wed, 21 Jan 2026 12:40:38 +0100 Subject: [PATCH 2/3] format --- Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx b/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx index 9364f2dbc8d35..dcb2f2a57036a 100644 --- a/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx +++ b/Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx @@ -401,7 +401,7 @@ Detector::Detector(bool active) if (ft3BaseParam.configFile != "") { LOG(info) << "FT3 Geometry configuration file provided. Overriding FT3Base.geoModel configuration."; buildFT3FromFile(ft3BaseParam.configFile); - + } else { LOG(info) << "FT3 Geometry configuration file not provided. Using FT3Base.geoModel " << ft3BaseParam.geoModel << " configuration."; switch (ft3BaseParam.geoModel) { @@ -411,7 +411,7 @@ Detector::Detector(bool active) case Telescope: buildBasicFT3(ft3BaseParam); // BasicFT3 = Parametrized telescopic detector (equidistant layers) break; - case ScopingV3b: + case ScopingV3b: buildFT3Scoping(); // FT3 according to scoping document break; default: From 09de6ed4aae753931d6cdaee8b8a2e16372e909a Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Wed, 21 Jan 2026 12:40:58 +0100 Subject: [PATCH 3/3] Please consider the following formatting changes (#35)