Add magnet

Author: njacazio

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

@@ -31,14 +31,16 @@ enum MagnetLayout : int {
 
 enum DetLayout : int {
   StandardRadius = 0,
-  ReducedRadius = 1
+  ReducedRadius = 1,
+  Version2 = 2 // Specs from engineering note 2026-05-06
 };
 
 struct Alice3PassiveBaseParam : public o2::conf::ConfigurableParamHelper<Alice3PassiveBaseParam> {
   // Geometry Builder parameters
 
-  int mLayout = MagnetLayout::AluminiumStabilizer;
-  int mDetLayout = DetLayout::StandardRadius;
+  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::Version2;         // Detector layout: Standard or Reduced radius
 
   O2ParamDef(Alice3PassiveBaseParam, "Alice3PassiveBase");
 };

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

@@ -154,6 +154,7 @@ void Alice3Absorber::ConstructGeometry()
       absorings->DefineSection(17, -500, 236, 274);
       break;
     case o2::passive::DetLayout::ReducedRadius:
+    case o2::passive::DetLayout::Version2:
       absorings->DefineSection(0, 500, 201, 239);
       absorings->DefineSection(1, 400, 201, 239);
       absorings->DefineSection(2, 400, 197.5, 242.5);

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

@@ -107,6 +107,8 @@ void Alice3Magnet::ConstructGeometry()
   // Passive Base configuration parameters
   auto& passiveBaseParam = Alice3PassiveBaseParam::Instance();
 
+  const bool isVersion2 = (passiveBaseParam.mDetLayout == o2::passive::DetLayout::Version2);
+
   switch (passiveBaseParam.mDetLayout) {
     case o2::passive::DetLayout::StandardRadius:
       // Defined in the header file
@@ -122,6 +124,19 @@ void Alice3Magnet::ConstructGeometry()
       mOuterWrapThickness = 3.f;     // cm
       mZLength = 800.f;              // cm
       break;
+    case o2::passive::DetLayout::Version2:
+      // Engineering note 2026-05-06 baseline stack (radial):
+      // inner wall 3 mm + winding pack 48 mm + support cylinder 20 mm + MLI 2 mm + outer wall 3 mm.
+      mInnerWrapInnerRadius = 125.f;                                        // cm
+      mInnerWrapThickness = 0.3f;                                           // cm
+      mCoilInnerRadius = mInnerWrapInnerRadius + mInnerWrapThickness;       // cm
+      mCoilThickness = 4.8f;                                                // cm
+      mRestMaterialRadius = mCoilInnerRadius + mCoilThickness;              // cm
+      mRestMaterialThickness = 2.2f;                                        // cm
+      mOuterWrapInnerRadius = mRestMaterialRadius + mRestMaterialThickness; // cm
+      mOuterWrapThickness = 0.3f;                                           // cm
+      mZLength = 800.f;                                                     // cm
+      break;
     default:
       LOG(fatal) << "Unknown detector layout " << passiveBaseParam.mDetLayout;
       break;
@@ -133,6 +148,10 @@ void Alice3Magnet::ConstructGeometry()
       // Handled in the header file
       break;
     case o2::passive::MagnetLayout::CopperStabilizer:
+      if (isVersion2) {
+        LOG(warn) << "Alice 3 magnet: CopperStabilizer override ignored for Version2 (engineering-note stack)";
+        break;
+      }
       doCopperStabilizer = true;
       mRestMaterialThickness -= 3.3; // cm Remove the Aluminium stabiliser
       mRestMaterialThickness += 2.2; // cm Add the Copper stabiliser

Detectors/Upgrades/ALICE3/macros/ALICE3Field.C

@@ -17,10 +17,10 @@ std::function<void(const double*, double*)> field()
     double Rc;
     double R1;
     double R2;
-    double B1;
+    const double B1 = 0.5; // [T]
     double B2;
-    const double beamStart = 500.;    //[cm]
-    const double tokGauss = 1. / 0.1; // conversion from Tesla to kGauss
+    const double beamStart = 500.;    // [cm]
+    static constexpr double tokGauss = 1. / 0.1; // conversion from Tesla to kGauss
 
     bool isMagAbs = true;
 
@@ -34,7 +34,6 @@ std::function<void(const double*, double*)> field()
     R2 = 290.; //[cm]
 
     // To set the B2
-    B1 = 2.;                                    //[T]
     B2 = -Rc * Rc / ((R2 * R2 - R1 * R1) * B1); //[T]
 
     if ((abs(x[2]) <= beamStart) && (sqrt(x[0] * x[0] + x[1] * x[1]) < Rc)) {
@@ -69,8 +68,9 @@ void ALICE3Field()
 {
   auto fieldFunc = field();
   // RZ plane visualization
-  TCanvas* cRZ = new TCanvas("cRZ", "Field in RZ plane", 800, 600);
-  TH2F* hRZ = new TH2F("hRZ", "Magnetic Field B_z in RZ plane;Z [m];R [m]", 100, -10, 10, 100, -5, 5);
+  TCanvas* cRZ = new TCanvas("cRZ", "Field in RZ plane", 800, 800);
+  gPad->SetRightMargin(0.15);
+  TH2F* hRZ = new TH2F("hRZ", "Magnetic Field B_z in RZ plane;Z [m];R [m];B_{z} [kGauss]", 100, -10, 10, 100, -5, 5);
   hRZ->SetBit(TH1::kNoStats); // disable stats box
   for (int i = 1; i <= hRZ->GetNbinsX(); i++) {
     const double Z = hRZ->GetXaxis()->GetBinCenter(i);
@@ -87,8 +87,9 @@ void ALICE3Field()
   cRZ->Update();
 
   // XY plane visualization
-  TCanvas* cXY = new TCanvas("cXY", "Field in XY plane", 800, 600);
-  TH2F* hXY = new TH2F("hXY", "Magnetic Field B_z in XY plane;X [m];Y [m]", 100, -5, 5, 100, -5, 5);
+  TCanvas* cXY = new TCanvas("cXY", "Field in XY plane", 800, 800);
+  gPad->SetRightMargin(0.15);
+  TH2F* hXY = new TH2F("hXY", "Magnetic Field B_z in XY plane;X [m];Y [m];B_{z} [kGauss]", 100, -5, 5, 100, -5, 5);
   hXY->SetBit(TH1::kNoStats); // disable stats box
 
   for (int i = 1; i <= hXY->GetNbinsX(); i++) {