Skip to content

Commit 2bfcd91

Browse files
committed
Update A3 Magnet
1 parent 16b6488 commit 2bfcd91

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ enum MagnetLayout : int {
3131

3232
enum DetLayout : int {
3333
StandardRadius = 0,
34-
ReducedRadius = 1
34+
ReducedRadius = 1,
35+
Version2 = 2 // Specs from engineering note 2026-05-06
3536
};
3637

3738
struct Alice3PassiveBaseParam : public o2::conf::ConfigurableParamHelper<Alice3PassiveBaseParam> {
3839
// Geometry Builder parameters
3940

40-
int mLayout = MagnetLayout::AluminiumStabilizer;
41-
int mDetLayout = DetLayout::StandardRadius;
41+
MagnetLayout mLayout = MagnetLayout::AluminiumStabilizer; // Magnet layout: Aluminium or Copper stabilizer
42+
DetLayout mDetLayout = DetLayout::StandardRadius; // Detector layout: Standard or Reduced radius
4243

4344
O2ParamDef(Alice3PassiveBaseParam, "Alice3PassiveBase");
4445
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ void Alice3Absorber::ConstructGeometry()
154154
absorings->DefineSection(17, -500, 236, 274);
155155
break;
156156
case o2::passive::DetLayout::ReducedRadius:
157+
case o2::passive::DetLayout::Version2:
157158
absorings->DefineSection(0, 500, 201, 239);
158159
absorings->DefineSection(1, 400, 201, 239);
159160
absorings->DefineSection(2, 400, 197.5, 242.5);

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ void Alice3Magnet::ConstructGeometry()
107107
// Passive Base configuration parameters
108108
auto& passiveBaseParam = Alice3PassiveBaseParam::Instance();
109109

110+
const bool isVersion2 = (passiveBaseParam.mDetLayout == o2::passive::DetLayout::Version2);
111+
110112
switch (passiveBaseParam.mDetLayout) {
111113
case o2::passive::DetLayout::StandardRadius:
112114
// Defined in the header file
@@ -122,6 +124,19 @@ void Alice3Magnet::ConstructGeometry()
122124
mOuterWrapThickness = 3.f; // cm
123125
mZLength = 800.f; // cm
124126
break;
127+
case o2::passive::DetLayout::Version2:
128+
// Engineering note 2026-05-06 baseline stack (radial):
129+
// inner wall 3 mm + winding pack 48 mm + support cylinder 20 mm + MLI 2 mm + outer wall 3 mm.
130+
mInnerWrapInnerRadius = 125.f; // cm
131+
mInnerWrapThickness = 0.3f; // cm
132+
mCoilInnerRadius = mInnerWrapInnerRadius + mInnerWrapThickness; // cm
133+
mCoilThickness = 4.8f; // cm
134+
mRestMaterialRadius = mCoilInnerRadius + mCoilThickness; // cm
135+
mRestMaterialThickness = 2.2f; // cm
136+
mOuterWrapInnerRadius = mRestMaterialRadius + mRestMaterialThickness; // cm
137+
mOuterWrapThickness = 0.3f; // cm
138+
mZLength = 800.f; // cm
139+
break;
125140
default:
126141
LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mDetLayout;
127142
break;
@@ -133,6 +148,10 @@ void Alice3Magnet::ConstructGeometry()
133148
// Handled in the header file
134149
break;
135150
case o2::passive::MagnetLayout::CopperStabilizer:
151+
if (isVersion2) {
152+
LOG(warn) << "Alice 3 magnet: CopperStabilizer override ignored for Version2 (engineering-note stack)";
153+
break;
154+
}
136155
doCopperStabilizer = true;
137156
mRestMaterialThickness -= 3.3; // cm Remove the Aluminium stabiliser
138157
mRestMaterialThickness += 2.2; // cm Add the Copper stabiliser

0 commit comments

Comments
 (0)