SetL3ConstField() provides const field in abs(z) < 370.

diff --git a/STEER/AliMagFMaps.cxx b/STEER/AliMagFMaps.cxx
index 893447067a27ca9bf4ae235a483623d8b6d28de1..7ae12bbbe4854185a69ea2d783015974bd4993ca 100644 (file)
--- a/STEER/AliMagFMaps.cxx
+++ b/STEER/AliMagFMaps.cxx
@@ -106,14 +106,12 @@ void AliMagFMaps::ReadField()
   char* fname;
   TFile* file = 0;
   if (fMap == k2kG) {
-      if (fL3Option) {
-         fSolenoid = 2.;
-         fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B02.root");
-         file = new TFile(fname);
-         fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B02"));
-         file->Close();
-         delete file;
-      }
+      fSolenoid = 2.;
+      fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B02.root");
+      file = new TFile(fname);
+      fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B02"));
+      file->Close();
+      delete file;
       fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB02.root");
       file = new TFile(fname);
       fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB02"));
@@ -126,15 +124,12 @@ void AliMagFMaps::ReadField()
       file->Close();
       delete file;
   } else if (fMap == k4kG) {
-      if (fL3Option) {
-         fSolenoid = 4.;
-         fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B04.root");
-         file = new TFile(fname);
-         fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B04"));
-         file->Close();
-         delete file;
-      }
-      
+      fSolenoid = 4.;
+      fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B04.root");
+      file = new TFile(fname);
+      fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B04"));
+      file->Close();
+      delete file;
       fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB04.root");
       file = new TFile(fname);
       fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB04"));
@@ -147,15 +142,12 @@ void AliMagFMaps::ReadField()
       file->Close();
       delete file;
   } else if (fMap == k5kG) {
-      if (fL3Option) {
-         fSolenoid = 5.;
-         fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B05.root");
-         file = new TFile(fname);
-         fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B05"));
-         file->Close();
-         delete file;
-      }
-      
+      fSolenoid = 5.;
+      fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/L3B05.root");
+      file = new TFile(fname);
+      fFieldMap[0] = dynamic_cast<AliFieldMap*>(file->Get("L3B05"));
+      file->Close();
+      delete file;
       fname = gSystem->ExpandPathName("$(ALICE_ROOT)/data/maps/DipB05.root");
       file = new TFile(fname);
       fFieldMap[1] = dynamic_cast<AliFieldMap*>(file->Get("DipB05"));
@@ -167,27 +159,10 @@ void AliMagFMaps::ReadField()
       fFieldMap[2] = dynamic_cast<AliFieldMap*>(file->Get("ExtB05"));
       file->Close();
       delete file;
-      
-  }
-  
-  if (!fL3Option) {
-      //
-      // Dummy L3 map
-      fFieldMap[0] = new AliFieldMap();
-      fFieldMap[0] -> SetLimits(-800., 800., -800., 800., -700., 700.);
-      switch(fMap) {
-      case k2kG:
-         fSolenoid = 2.;
-         break;
-      case k4kG:
-         fSolenoid = 4.;
-         break;
-      case k5kG:
-         fSolenoid = 5.;
-         break;
-      }
-      fSolenoidUser = fSolenoid;
   }
+
+  if (!fL3Option) fSolenoidUser = fSolenoid;
+
 }
 
 //_______________________________________________________________________
@@ -227,13 +202,13 @@ void AliMagFMaps::Field(Float_t *x, Float_t *b)
   AliFieldMap* map = 0;
   if (fFieldMap[0]->Inside(xm[0], xm[1], xm[2])) {
       map = fFieldMap[0];
-      if (!fL3Option) {
+      if (!fL3Option && TMath::Abs(xm[2]) < 370.) {
       //
-      //     Constant L3 field, if this option was selected
+      //     Constant L3 field , if this option was selected
       //
-         b[2] = fSolenoidUser;
+         b[2] = - fSolenoid;
          return;
-    }
+      } 
   } else if (fFieldMap[1]->Inside(xm[0], xm[1], xm[2])) {
     map = fFieldMap[1];
   } else if (fFieldMap[2]->Inside(xm[0], xm[1], xm[2])) {