Clean

Author: njacazio

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

@@ -42,7 +42,7 @@ struct Alice3PassiveBaseParam : public o2::conf::ConfigurableParamHelper<Alice3P
 
   MagnetLayout mLayout = MagnetLayout::AluminiumStabilizer; // Magnet layout: Aluminium or Copper stabilizer
   // DetLayout mDetLayout = DetLayout::StandardRadius;         // Detector layout: Standard or Reduced radius
-  DetLayout mDetLayout = o2::passive::DetLayout::SteppedAbsorber;         // Detector layout: Standard or Reduced radius
+  DetLayout mDetLayout = o2::passive::DetLayout::SteppedAbsorber; // Detector layout: Standard or Reduced radius
 
   O2ParamDef(Alice3PassiveBaseParam, "Alice3PassiveBase");
 };

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);
+  TGeoPcon* absorings = nullptr;
   switch (passiveBaseParam.mDetLayout) {
     case o2::passive::DetLayout::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);
@@ -155,7 +155,7 @@ void Alice3Absorber::ConstructGeometry()
       absorings->DefineSection(17, -500, 236, 274);
       break;
     case o2::passive::DetLayout::ReducedRadius:
-    case o2::passive::DetLayout::Version2:
+      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);
@@ -178,12 +178,13 @@ void Alice3Absorber::ConstructGeometry()
     case o2::passive::DetLayout::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;