Refactor absorber geometry initialization logic

Author: njacazio

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

@@ -131,10 +131,10 @@ void Alice3Absorber::ConstructGeometry()
   }
 
   auto& passiveBaseParam = Alice3PassiveBaseParam::Instance();
-  int nSections = (passiveBaseParam.mDetLayout == o2::passive::DetLayout::SteppedAbsorber) ? 6 : 18;
-  TGeoPcon* absorings = new TGeoPcon(0., 360., nSections);
-  switch (passiveBaseParam.mDetLayout) {
-    case o2::passive::DetLayout::StandardRadius:
+  TGeoPcon* absorings = nullptr;
+  switch (passiveBaseParam.mMagAbsLayout) {
+    case o2::passive::MagnetAbsorberLayout::StandardRadius:
+      absorings = new TGeoPcon(0., 360., 18);
       absorings->DefineSection(0, 500, 236, 274);
       absorings->DefineSection(1, 400, 236, 274);
       absorings->DefineSection(2, 400, 232.5, 277.5);
@@ -154,7 +154,8 @@ void Alice3Absorber::ConstructGeometry()
       absorings->DefineSection(16, -400, 236, 274);
       absorings->DefineSection(17, -500, 236, 274);
       break;
-    case o2::passive::DetLayout::ReducedRadius:
+    case o2::passive::MagnetAbsorberLayout::ReducedRadius:
+      absorings = new TGeoPcon(0., 360., 18);
       absorings->DefineSection(0, 500, 201, 239);
       absorings->DefineSection(1, 400, 201, 239);
       absorings->DefineSection(2, 400, 197.5, 242.5);
@@ -174,18 +175,19 @@ void Alice3Absorber::ConstructGeometry()
       absorings->DefineSection(16, -400, 201, 239);
       absorings->DefineSection(17, -500, 201, 239);
       break;
-    case o2::passive::DetLayout::SteppedAbsorber:
+    case o2::passive::MagnetAbsorberLayout::SteppedAbsorber:
       // Geometria 6 (Ian/tesis): Rext=290 constante, escalon en Rmin.
       // Externas 45 cm (Rmin=245), central 70 cm (Rmin=220). Ref: Ian DetectorConstruction.cc abs_thickness={45,70,45}
+      absorings = new TGeoPcon(0., 360., 6);
       absorings->DefineSection(0, -500, 245, 290);
       absorings->DefineSection(1, -300, 245, 290);
       absorings->DefineSection(2, -300, 220, 290);
-      absorings->DefineSection(3,  300, 220, 290);
-      absorings->DefineSection(4,  300, 245, 290);
-      absorings->DefineSection(5,  500, 245, 290);
+      absorings->DefineSection(3, 300, 220, 290);
+      absorings->DefineSection(4, 300, 245, 290);
+      absorings->DefineSection(5, 500, 245, 290);
       break;
     default:
-      LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mDetLayout;
+      LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mMagAbsLayout;
       break;
   }