Wrong initialisation of machine field in constructor corrected.

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index 468b2a6f34b70e2da9dfd1819687321a4457ad78..a82b2e8909d2cc8ab8592d4a44d125e53fb094c7 100644 (file)
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -65,40 +65,6 @@ AliMagFC::AliMagFC(const char *name, const char *title, Int_t integ,
   fType = kConst;
   fMap  = 1;
   
-  //////////////////////////////////////////////////////////////////////
-  // ---- Magnetic field values (according to beam type and energy) ----
-  if(fBeamType==kBeamTypepp && fBeamEnergy==5000.){
-  // p-p @ 5+5 TeV
-      fQuadGradient = 15.7145;
-      fDipoleField  = 27.0558;
-      // SIDE C
-      fCCorrField   = 9.7017;
-      // SIDE A
-      fACorr1Field  = -13.2143;
-      fACorr2Field  = -11.9909;
-  } else if (fBeamType == kBeamTypepp && fBeamEnergy == 450.) {
-  // p-p 0.45+0.45 TeV
-      Float_t const kEnergyRatio = fBeamEnergy / 7000.;
-      
-      fQuadGradient = 22.0002 * kEnergyRatio;
-      fDipoleField  = 37.8781 * kEnergyRatio;
-      // SIDE C
-      fCCorrField   =  9.6908 * kEnergyRatio;
-      // SIDE A
-      fACorr1Field  = -13.2014;
-      fACorr2Field  = -9.6908;
-  } else if ((fBeamType == kBeamTypepp && fBeamEnergy == 7000.) ||
-            (fBeamType == kBeamTypeAA))
-  {
-      // Pb-Pb @ 2.7+2.7 TeV or p-p @ 7+7 TeV
-      fQuadGradient = 22.0002;
-      fDipoleField  = 37.8781;
-      // SIDE C
-      fCCorrField   = 9.6908;
-      // SIDE A
-      fACorr1Field  = -13.2014;
-      fACorr2Field  = -9.6908;
-  }
 }
 
 //________________________________________
@@ -139,6 +105,48 @@ void AliMagFC::ZDCField(Float_t *x, Float_t *b) const
   // ---- This is the ZDC part
   
   Float_t rad2 = x[0] * x[0] + x[1] * x[1];
+  static Bool_t init = kFALSE;
+
+  if (! init) {
+      init = kTRUE;
+      //////////////////////////////////////////////////////////////////////
+      // ---- Magnetic field values (according to beam type and energy) ----
+      if(fBeamType==kBeamTypepp && fBeamEnergy == 5000.){
+         // p-p @ 5+5 TeV
+         fQuadGradient = 15.7145;
+         fDipoleField  = 27.0558;
+         // SIDE C
+         fCCorrField   = 9.7017;
+         // SIDE A
+         fACorr1Field  = -13.2143;
+         fACorr2Field  = -11.9909;
+      } else if (fBeamType == kBeamTypepp && fBeamEnergy == 450.) {
+         // p-p 0.45+0.45 TeV
+         Float_t const kEnergyRatio = fBeamEnergy / 7000.;
+         
+         fQuadGradient = 22.0002 * kEnergyRatio;
+         fDipoleField  = 37.8781 * kEnergyRatio;
+         // SIDE C
+         fCCorrField   =  9.6908;
+         // SIDE A
+         fACorr1Field  = -13.2014;
+         fACorr2Field  = -9.6908;
+      } else if ((fBeamType == kBeamTypepp && fBeamEnergy == 7000.) ||
+                (fBeamType == kBeamTypeAA))
+      {
+         // Pb-Pb @ 2.7+2.7 TeV or p-p @ 7+7 TeV
+         fQuadGradient = 22.0002;
+         fDipoleField  = 37.8781;
+         // SIDE C
+         fCCorrField   = 9.6908;
+         // SIDE A
+         fACorr1Field  = -13.2014;
+         fACorr2Field  = -9.6908;
+      }
+      
+      printf("Machine field %5d %13.3f %13.3f \n", fBeamType, fBeamEnergy, fDipoleField);
+  }
+  
   
   // SIDE C **************************************************
   if(x[2]<0.){  

diff --git a/STEER/AliMagFC.h b/STEER/AliMagFC.h
index 3fee639f0a27eb6821655e77096c0d24719b4115..680ea4a4df2bb5e5e6d25be9a87865a1de684466 100644 (file)
--- a/STEER/AliMagFC.h
+++ b/STEER/AliMagFC.h
@@ -34,11 +34,11 @@ private:
   Bool_t     fCompensator; // Flag for compensator magnetic field (kTrue -> ON)
   BeamType_t fBeamType;    // Beam type: A-A (fBeamType=0) or p-p (fBeamType=1)
   Float_t    fBeamEnergy;  // Beam energy in GeV
-  Float_t    fQuadGradient;// Gradient field for inner triplet quadrupoles
-  Float_t    fDipoleField; // Field value for D1 and D2 dipoles
-  Float_t    fCCorrField;  // Side C 2nd compensator field
-  Float_t    fACorr1Field; // Side A 1st compensator field 
-  Float_t    fACorr2Field; // Side A 2nd compensator field
+  mutable Float_t    fQuadGradient;// Gradient field for inner triplet quadrupoles
+  mutable Float_t    fDipoleField; // Field value for D1 and D2 dipoles
+  mutable Float_t    fCCorrField;  // Side C 2nd compensator field
+  mutable Float_t    fACorr1Field; // Side A 1st compensator field 
+  mutable Float_t    fACorr2Field; // Side A 2nd compensator field
   
   ClassDef(AliMagFC,3)  //Class for all Alice Constant MagField 
 };