Skip to content

Commit 83570ed

Browse files
authored
Refactor magnet and detector layout enums
1 parent 47293b5 commit 83570ed

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

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

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

27-
enum MagnetLayout : int {
28-
AluminiumStabilizer = 0,
29-
CopperStabilizer = 1,
30-
WindingPack = 2,
31-
SuperconductingMagnet = 3
27+
enum MagnetType : int {
28+
AluminiumStabilizer = 0, // Using Aluminium stabilizer for the magnet
29+
CopperStabilizer = 1, // Using Copper stabilizer for the magnet
30+
WindingPack = 2, // Using Winding Pack for the magnet
31+
SuperconductingMagnet = 3 // Using Superconducting magnet (NbTi+Cu+Al) for the magnet
3232
};
3333

34-
enum DetLayout : int {
35-
StandardRadius = 0,
36-
ReducedRadius = 1,
37-
SteppedAbsorber = 2
34+
enum MagnetAbsorberLayout : int {
35+
StandardRadius = 0, // Using standard radius for the magnet and absorber
36+
ReducedRadius = 1, // Using reduced radius for the magnet and absorber
37+
SteppedAbsorber = 2 // Using stepped absorber for the magnet and absorber
3838
};
3939

4040
struct Alice3PassiveBaseParam : public o2::conf::ConfigurableParamHelper<Alice3PassiveBaseParam> {
4141
// Geometry Builder parameters
4242

43-
int mLayout = MagnetLayout::AluminiumStabilizer;
44-
int mDetLayout = DetLayout::StandardRadius;
43+
MagnetType mMagType = MagnetType::AluminiumStabilizer; // Magnet type: as in MagnetType enum
44+
MagnetAbsorberLayout mMagAbsLayout = o2::passive::MagnetAbsorberLayout::SteppedAbsorber; // Magnet and absorber layout: as in MagnetAbsorberLayout enum
4545

4646
O2ParamDef(Alice3PassiveBaseParam, "Alice3PassiveBase");
4747
};

0 commit comments

Comments
 (0)