From 140fd6cdbb68552d9ef9815d5f74e3e41a3455a0 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 19 May 2026 12:34:03 +0000 Subject: [PATCH] Please consider the following formatting changes --- .../FT3Simulation/FT3ModuleConstants.h | 6 +++--- .../ALICE3/FT3/simulation/src/FT3Layer.cxx | 4 ++-- .../ALICE3/FT3/simulation/src/FT3Module.cxx | 21 ++++++------------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h b/Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h index 129814d6c03ca..4f2bfce5c3f1d 100644 --- a/Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h +++ b/Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h @@ -153,7 +153,7 @@ const std::vector 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 maxToleranceInner = 0.; // default not allowed inwards const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation const std::vector staveOnFront = { @@ -180,8 +180,8 @@ const std::vector 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 double maxToleranceInner = 0.; // default not allowed inwards +const double maxToleranceOuter = 3.4; // leave 1mm for layer air encapsulation const std::vector staveOnFront = { 1, 0, 1, 0, 1, 0, 1, 0, // L diff --git a/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx b/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx index 7484ccd7cb162..c7f0172b33674 100644 --- a/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx +++ b/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx @@ -459,8 +459,8 @@ 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; - // 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) + // 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); diff --git a/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx b/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx index 7decf11acd47f..91aac274dbcba 100644 --- a/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx +++ b/Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Module.cxx @@ -553,8 +553,7 @@ void FT3Module::create_layout_staveGeo(double mZ, int layerNumber, int direction // each entry is a vector, where each entry is the number of modules of that stack height std::vector> nSensorStackCountPerStave( staveConfig.x_midpoints.size(), - std::vector(Constants::kSensorsPerStack.size(), 0) - ); + std::vector(Constants::kSensorsPerStack.size(), 0)); std::vector nSensorStackTotal(Constants::kSensorsPerStack.size(), 0); for (unsigned i_stave = 0; i_stave < staveConfig.x_midpoints.size(); i_stave++) { y_positionsPosNeg.emplace_back(PosNegPositionTypes{PositionTypes{}, PositionTypes{}}); @@ -669,23 +668,17 @@ void FT3Module::create_layout_staveGeo(double mZ, int layerNumber, int direction // now add the sensor positions on the stave for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) { - unsigned nModulesCurr = y_positionsPosNeg.back().first.size() - + y_positionsPosNeg.back().second.size(); + unsigned nModulesCurr = y_positionsPosNeg.back().first.size() + y_positionsPosNeg.back().second.size(); fill_stave(y_positionsPosNeg.back(), Rin, Rout, x_left, Constants::kSensorsPerStack[i_kSens], y_ranges, absAllowedYRange); - unsigned nModulesAdded = y_positionsPosNeg.back().first.size() - + y_positionsPosNeg.back().second.size() - - nModulesCurr; + unsigned nModulesAdded = y_positionsPosNeg.back().first.size() + y_positionsPosNeg.back().second.size() - nModulesCurr; nSensorStackCountPerStave[i_stave][i_kSens] = nModulesAdded; nSensorStackTotal[i_kSens] += nModulesAdded; } - std::string moduleDebugStr = "Module size counts for layer " + std::to_string(layerNumber) - + " in direction " + std::to_string(direction) + ":\n"; + std::string moduleDebugStr = "Module size counts for layer " + std::to_string(layerNumber) + " in direction " + std::to_string(direction) + ":\n"; for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) { - moduleDebugStr += "\t" + std::to_string(nSensorStackCountPerStave[i_stave][i_kSens]) - + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) - + " sensors stacked\n"; + moduleDebugStr += "\t" + std::to_string(nSensorStackCountPerStave[i_stave][i_kSens]) + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) + " sensors stacked\n"; } LOG(debug) << moduleDebugStr; } @@ -693,9 +686,7 @@ void FT3Module::create_layout_staveGeo(double mZ, int layerNumber, int direction "Total module size counts for layer " + std::to_string(layerNumber) + " in direction " + std::to_string(direction) + ":\n"; for (unsigned i_kSens = 0; i_kSens < Constants::kSensorsPerStack.size(); i_kSens++) { - totalModuleInfoStr += "\t" + std::to_string(nSensorStackTotal[i_kSens]) - + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) - + " sensors stacked\n"; + totalModuleInfoStr += "\t" + std::to_string(nSensorStackTotal[i_kSens]) + " modules with " + std::to_string(Constants::kSensorsPerStack[i_kSens]) + " sensors stacked\n"; } LOG(info) << totalModuleInfoStr;