Refactor magnet layout handling in Magnet.cxx

Author: njacazio

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

@@ -119,12 +119,12 @@ void Alice3Magnet::ConstructGeometry()
   // Passive Base configuration parameters
   auto& passiveBaseParam = Alice3PassiveBaseParam::Instance();
 
-  switch (passiveBaseParam.mDetLayout) {
-    case o2::passive::DetLayout::StandardRadius:
+  switch (passiveBaseParam.mMagAbsLayout) {
+    case o2::passive::MagnetAbsorberLayout::StandardRadius:
       // Defined in the header file
       break;
-    case o2::passive::DetLayout::SteppedAbsorber: // Ian absorber uses ReducedRadius magnet
-    case o2::passive::DetLayout::ReducedRadius:
+    case o2::passive::MagnetAbsorberLayout::SteppedAbsorber: // Ian absorber uses ReducedRadius magnet
+    case o2::passive::MagnetAbsorberLayout::ReducedRadius:
       mInnerWrapInnerRadius = 125.f; // cm
       mInnerWrapThickness = 1.f;     // cm
       mCoilInnerRadius = 145.f;      // cm
@@ -136,42 +136,42 @@ void Alice3Magnet::ConstructGeometry()
       mZLength = 800.f;              // cm
       break;
     default:
-      LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mDetLayout;
+      LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mMagAbsLayout;
       break;
   }
 
   bool doCopperStabilizer = false;
   bool doWindingPack = false;
-  switch (passiveBaseParam.mLayout) {
-    case o2::passive::MagnetLayout::AluminiumStabilizer:
+  switch (passiveBaseParam.mMagType) {
+    case o2::passive::MagnetType::AluminiumStabilizer:
       // Handled in the header file
       break;
-    case o2::passive::MagnetLayout::CopperStabilizer:
+    case o2::passive::MagnetType::CopperStabilizer:
       doCopperStabilizer = true;
       mRestMaterialThickness -= 3.3; // cm Remove the Aluminium stabiliser
       mRestMaterialThickness += 2.2; // cm Add the Copper stabiliser
       LOG(debug) << "Alice 3 magnet: using Copper Stabilizer with thickness " << mRestMaterialThickness << " cm";
       break;
-    case o2::passive::MagnetLayout::WindingPack:
+    case o2::passive::MagnetType::WindingPack:
       doWindingPack = true;
       LOG(debug) << "Alice 3 magnet: using WindingPack (NbTi+Cu+Al) coil";
       break;
-    case o2::passive::MagnetLayout::SuperconductingMagnet:
+    case o2::passive::MagnetType::SuperconductingMagnet:
       // Ian Perez Garcia design (ICN-UNAM) — radios desde DetectorConstruction.cc
-      doWindingPack = true; // usa WindingPack como material del coil
-      mInnerWrapInnerRadius  = 140.f; // cm — pared interna criostato
-      mInnerWrapThickness    = 1.0f;  // cm — Al
-      mCoilInnerRadius       = 160.f; // cm — bobina (tras gap de vacío)
-      mCoilThickness         = 0.3f;  // cm — NbTi/Cu
-      mRestMaterialRadius    = 160.3f;// cm — soporte bobina
-      mRestMaterialThickness = 15.7f;  // cm — Al
-      mOuterWrapInnerRadius  = 197.f; // cm — soporte restante (6 cm Al) + pared externa
-      mOuterWrapThickness    = 3.0f;  // cm — pared externa Al, R=197-200
-      mZLength               = 800.f; // cm
+      doWindingPack = true;           // usa WindingPack como material del coil
+      mInnerWrapInnerRadius = 140.f;  // cm — pared interna criostato
+      mInnerWrapThickness = 1.0f;     // cm — Al
+      mCoilInnerRadius = 160.f;       // cm — bobina (tras gap de vacío)
+      mCoilThickness = 0.3f;          // cm — NbTi/Cu
+      mRestMaterialRadius = 160.3f;   // cm — soporte bobina
+      mRestMaterialThickness = 15.7f; // cm — Al
+      mOuterWrapInnerRadius = 197.f;  // cm — soporte restante (6 cm Al) + pared externa
+      mOuterWrapThickness = 3.0f;     // cm — pared externa Al, R=197-200
+      mZLength = 800.f;               // cm
       LOG(debug) << "Alice 3 magnet: using Ian Perez Garcia design (ICN-UNAM)";
       break;
     default:
-      LOG(fatal) << "Unknown magnet layout " << passiveBaseParam.mLayout;
+      LOG(fatal) << "Unknown magnet layout " << passiveBaseParam.mMagType;
       break;
   }
 
@@ -232,4 +232,4 @@ FairModule* Alice3Magnet::CloneModule() const
 {
   return new Alice3Magnet(*this);
 }
-ClassImp(o2::passive::Alice3Magnet)
+ClassImp(o2::passive::Alice3Magnet)