Skip to content

Commit 9dbc102

Browse files
committed
Update
1 parent febb390 commit 9dbc102

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Detectors/Upgrades/ALICE3/Passive/include/Alice3DetectorsPassive/PassiveBaseParam.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ namespace passive
2424
// ** Parameters for Passive base configuration
2525
// **
2626

27-
enum MagnetGeometry : int {
27+
enum MagnetLayout : int {
2828
AluminiumStabilizer = 0,
2929
CopperStabilizer = 1
3030
};
3131

3232
struct Alice3PassiveBaseParam : public o2::conf::ConfigurableParamHelper<Alice3PassiveBaseParam> {
3333
// Geometry Builder parameters
3434

35-
int mGeometry = MagnetGeometry::AluminiumStabilizer;
35+
int mLayout = MagnetLayout::AluminiumStabilizer;
3636

37-
O2ParamDef(Alice3PassiveBaseParam, "PassiveBase");
37+
O2ParamDef(Alice3PassiveBaseParam, "Alice3PassiveBase");
3838
};
3939

4040
} // namespace passive

Detectors/Upgrades/ALICE3/Passive/src/Magnet.cxx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void Alice3Magnet::createMaterials()
6060
// | Inner cryostat | 10 | 8.896 | 0.112 |
6161
// | Outer cryostat | 30 | 8.896 | 0.337 |
6262
// +------------------+-------------------------+----------+--------+
63-
// Update: 2025-06-16
63+
// Update: 2025-06-16 enabledby setting Alice3PassiveBase.mLayout=1
6464
// +------------------+-------------------------+----------+--------+
6565
// | layer | effective thickness [mm]| X0 [cm] | X0 [%] |
6666
// +------------------+-------------------------+----------+--------+
@@ -106,10 +106,11 @@ void Alice3Magnet::ConstructGeometry()
106106

107107
// Passive Base configuration parameters
108108
auto& passiveBaseParam = Alice3PassiveBaseParam::Instance();
109-
const bool doCopperStabilizer = (passiveBaseParam.mGeometry == o2::passive::MagnetGeometry::CopperStabilizer);
109+
const bool doCopperStabilizer = (passiveBaseParam.mLayout == o2::passive::MagnetLayout::CopperStabilizer);
110110
if (doCopperStabilizer) {
111111
mRestMaterialThickness -= 3.3; // cm Remove the Aluminium stabiliser
112112
mRestMaterialThickness += 2.2; // cm Add the Copper stabiliser
113+
LOG(debug) << "Alice 3 magnet: using Copper Stabilizer with thickness " << mRestMaterialThickness << " cm";
113114
}
114115

115116
TGeoManager* geoManager = gGeoManager;
@@ -124,16 +125,16 @@ void Alice3Magnet::ConstructGeometry()
124125
auto kMedVac = matmgr.getTGeoMedium("ALICE3_MAGNET_VACUUM");
125126

126127
// inner wrap
127-
LOGP(debug, "Alice 3 magnet: creating inner wrap with inner radius {} and thickness {}", mInnerWrapInnerRadius, mInnerWrapThickness);
128+
LOGP(debug, "Alice 3 magnet: creating inner wrap with inner radius {} cm and thickness {} cm", mInnerWrapInnerRadius, mInnerWrapThickness);
128129
TGeoTube* innerLayer = new TGeoTube(mInnerWrapInnerRadius, mInnerWrapInnerRadius + mInnerWrapThickness, mZLength / 2);
129130
TGeoTube* innerVacuum = new TGeoTube(mInnerWrapInnerRadius + mInnerWrapThickness, mCoilInnerRadius, mZLength / 2);
130131
// coils layer
131-
LOGP(debug, "Alice 3 magnet: creating coils layer with inner radius {} and thickness {}", mCoilInnerRadius, mCoilThickness);
132+
LOGP(debug, "Alice 3 magnet: creating coils layer with inner radius {} cm and thickness {} cm", mCoilInnerRadius, mCoilThickness);
132133
TGeoTube* coilsLayer = new TGeoTube(mCoilInnerRadius, mCoilInnerRadius + mCoilThickness, mZLength / 2);
133134
TGeoTube* restMaterial = new TGeoTube(mRestMaterialRadius, mRestMaterialRadius + mRestMaterialThickness, mZLength / 2);
134135
TGeoTube* outerVacuum = new TGeoTube(mRestMaterialRadius + mRestMaterialThickness, mOuterWrapInnerRadius, mZLength / 2);
135136
// outer wrap
136-
LOGP(debug, "Alice 3 magnet: creating outer wrap with inner radius {} and thickness {}", mOuterWrapInnerRadius, mOuterWrapThickness);
137+
LOGP(debug, "Alice 3 magnet: creating outer wrap with inner radius {} cm and thickness {} cm", mOuterWrapInnerRadius, mOuterWrapThickness);
137138
TGeoTube* outerLayer = new TGeoTube(mOuterWrapInnerRadius, mOuterWrapInnerRadius + mOuterWrapThickness, mZLength / 2);
138139

139140
TGeoVolume* innerWrapVol = new TGeoVolume("innerWrap", innerLayer, kMedAl);

0 commit comments

Comments
 (0)