From 75b903bbded50900a5d759c45a8550ddf8886a95 Mon Sep 17 00:00:00 2001 From: Marco van Leeuwen Date: Tue, 22 Sep 2026 11:41:34 +0200 Subject: [PATCH 1/2] [ALICE 3] FT3 digitization: Change axis convention in disc sensors --- .../include/FT3Simulation/FT3Module.h | 2 +- .../TRKFT3/FT3/simulation/src/FT3Module.cxx | 34 +++++++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h index bd0d91e0f3820..71449b008cd80 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Module.h @@ -83,7 +83,7 @@ class FT3Module void addDetectorVolume( TGeoVolume* motherVolume, std::string volumeName, int color, TGeoMedium* med, unsigned volume_count, double x_mid, double y_mid, double z_mid, - double x_half_length, double y_half_length, double z_half_length); + double x_half_length, double y_half_length, double z_half_length, double rotX = 0); void add2x1GlueVolume( TGeoVolume* motherVolume, int layerNumber, int direction, unsigned stave_idx, diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx index 98832e6d0507f..7aa03d8db0477 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx @@ -374,21 +374,34 @@ void FT3Module::addStaveVolume( void FT3Module::addDetectorVolume( TGeoVolume* motherVolume, std::string volumeName, int color, TGeoMedium* med, unsigned volume_count, double x_mid, double y_mid, double z_mid, - double x_half_length, double y_half_length, double z_half_length) + double x_half_length, double y_half_length, double z_half_length, double rotX) { TGeoManager* geoManager = gGeoManager; TGeoVolume* volume = geoManager->MakeBox(volumeName.c_str(), med, x_half_length, y_half_length, z_half_length); volume->SetLineColor(color); volume->SetFillColorAlpha(color, 0.4); - motherVolume->AddNode( - volume, - volume_count, - new TGeoTranslation( // midpoint of box to add - x_mid, - y_mid, - z_mid) // TGeoTranslation - ); // addNode + if (rotX == 0.) { + motherVolume->AddNode( + volume, + volume_count, + new TGeoTranslation( // midpoint of box to add + x_mid, + y_mid, + z_mid) // TGeoTranslation + ); // addNode + } + else { + motherVolume->AddNode( + volume, + volume_count, + new TGeoCombiTrans("", + x_mid, + y_mid, + z_mid, + new TGeoRotation("", 0., rotX, 0.)) // TGeoCombinTrans + ); // addNode + } } /* @@ -463,11 +476,12 @@ void FT3Module::addSingleSensorVolume( TGeoVolume* sensor; TGeoManager* geoManager = gGeoManager; // ACTIVE AREA + // Sensor thickness is along the Y axis; this convention is used in digitisation by barrels and disks std::string sensor_name = "FT3Sensor_Active_" + std::to_string(direction) + "_" + std::to_string(layerNumber) + "_" + std::to_string(stave_idx) + "_" + std::to_string(volume_count); addDetectorVolume( motherVolume, sensor_name, Constants::SiColor, siliconMed, volume_count, active_x_mid, y_mid, z_mid, - Constants::active_width / 2, Constants::single_sensor_height / 2, Constants::siliconThickness / 2); + Constants::active_width / 2, Constants::siliconThickness / 2, Constants::single_sensor_height / 2, 90.); // INACTIVE STRIP ON LEFT OR RIGHT double inactive_x_mid = isLeft ? (active_x_mid - Constants::active_width / 2 - Constants::inactive_width / 2) From 17f30c2e39b96308fd84068edda50bdade4b94bf Mon Sep 17 00:00:00 2001 From: Marco van Leeuwen Date: Wed, 23 Sep 2026 08:46:49 +0200 Subject: [PATCH 2/2] [ALICE3] Git-clang formatting changes --- .../TRKFT3/FT3/simulation/src/FT3Module.cxx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx index 7aa03d8db0477..b10670bb15c7f 100644 --- a/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx +++ b/Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Module.cxx @@ -389,18 +389,17 @@ void FT3Module::addDetectorVolume( x_mid, y_mid, z_mid) // TGeoTranslation - ); // addNode - } - else { + ); // addNode + } else { motherVolume->AddNode( volume, volume_count, new TGeoCombiTrans("", - x_mid, - y_mid, - z_mid, - new TGeoRotation("", 0., rotX, 0.)) // TGeoCombinTrans - ); // addNode + x_mid, + y_mid, + z_mid, + new TGeoRotation("", 0., rotX, 0.)) // TGeoCombiTrans + ); // addNode } }