Skip to content

Please consider the following formatting changes to #15858 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JustusRudolph merged 1 commit into from
Sep 29, 2026
Merged

Please consider the following formatting changes to #15858 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3Materials.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -71,17 +70,17 @@ using ComponentArray = std::array<float, maxMaterialComponents>;

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;
};

Expand Down
56 changes: 28 additions & 28 deletions Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/include/FT3Simulation/FT3ModuleConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -227,34 +227,34 @@ const std::vector<bool> staveOnFront = makeStaveOnFront(nStaves);
* the bottom of the module the optimiser reports.
*/
const std::vector<std::vector<StaveFill>> 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

Expand Down
2 changes: 1 addition & 1 deletion Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Layer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion Detectors/Upgrades/ALICE3/TRKFT3/FT3/simulation/src/FT3Materials.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading