Updated GRP preprocessor (to be validated with Panos)

[u/mrichter/AliRoot.git] / STEER / AliMagFC.cxx

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index 802977010cffcd446b90ef04be327489d00c3bbf..26d5693b40c259c437f7528dce507ec88e3f7720 100644 (file)
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -13,29 +13,36 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
 
+//-------------------------------------------------------------------------
+//     Constant magnetic field class
+//     Used by AliRun class
+//     Author:
+//-------------------------------------------------------------------------
+
+#include <stdlib.h>
+
+#include "AliLog.h"
 #include "AliMagFC.h"
 
 ClassImp(AliMagFC)
 
 //________________________________________
-AliMagFC::AliMagFC(const char *name, const char *title, const Int_t integ, 
-                  const Int_t map, const Float_t factor, const Float_t fmax)
-  : AliMagF(name,title,integ,map,factor,fmax)
+AliMagFC::AliMagFC(const char *name, const char *title, Int_t integ, 
+                  Float_t factor, Float_t fmax)
+    : AliMagF(name,title,integ,factor,fmax),
+      fCompensator(kFALSE)
 {
   // 
   // Standard constructor
   //
-  printf("Constant Field %s created: map= %d, factor= %f\n",fName.Data(),map,
-        factor);
   fType = kConst;
+  fMap  = 1;
 }
 
 //________________________________________
-void AliMagFC::Field(Float_t *x, Float_t *b)
+void AliMagFC::Field(Float_t *x, Float_t *b) const
 {
   //
   // Method to return the field in a point
@@ -45,73 +52,78 @@ void AliMagFC::Field(Float_t *x, Float_t *b)
     if(TMath::Abs(x[2])<700 && x[0]*x[0]+(x[1]+30)*(x[1]+30) < 560*560) {
       b[2]=2;
     } else {
-      if ( 725 <= x[2] && x[2] <= 1225 ) {
-       Float_t dz = TMath::Abs(975-x[2])*0.01;
-       b[0]=(1-0.1*dz*dz)*7;
+      if ( -725 >= x[2] && x[2] >= -1225 ) {
+       Float_t dz = TMath::Abs(-975-x[2])*0.01;
+       b[0] = - (1-0.1*dz*dz)*7;
       }
       else {
-//This is the ZDC part
-       Float_t rad2=x[0]*x[0]+x[1]*x[1];
-       if(rad2<kD2RA2) {
-         if(x[2]>kD2BEG) {
-           
-//    Separator Dipole D2
-           if(x[2]<kD2END) b[1]=kFDIP;
-         } else if(x[2]>kD1BEG) {
-           
-//    Separator Dipole D1
-           if(x[2]<kD1END) b[1]=-kFDIP;
-         }
-         if(rad2<kCORRA2) {
-
-//    First quadrupole of inner triplet de-focussing in x-direction
-//    Inner triplet
-           if(x[2]>kZ4BEG) {
-             if(x[2]<kZ4END) {
-             
-//    2430 <-> 3060
-               b[0]=-kG1*x[1];
-               b[1]=-kG1*x[0];
-             }
-           } else if(x[2]>kZ3BEG) {
-             if(x[2]<kZ3END) {
-
-//    1530 <-> 2080
-               b[0]=kG1*x[1];
-               b[1]=kG1*x[0];
-             }
-           } else if(x[2]>kZ2BEG) {
-             if(x[2]<kZ2END) {
-             
-//    890 <-> 1430
-               b[0]=kG1*x[1];
-               b[1]=kG1*x[0];
-             }
-           } else if(x[2]>kZ1BEG) {
-             if(x[2]<kZ1END) {
-
-//    0 <->  630
-               b[0]=-kG1*x[1];
-               b[1]=-kG1*x[0];
-             }
-           } else if(x[2]>kCORBEG) {
-             if(x[2]<kCOREND) {
-//    Corrector dipole (because of dimuon arm)
-               b[0]=kFCORN;
-             }
-           }
-         }
-       }
+         ZDCField(x, b);
       }
     }
     if(fFactor!=1) {
-      b[0]*=fFactor;
-      b[1]*=fFactor;
-      b[2]*=fFactor;
+       b[0]*=fFactor;
+       b[1]*=fFactor;
+       b[2]*=fFactor;
     }
   } else {
-    printf("Invalid field map for constant field %d\n",fMap);
-    exit(1);
+      AliFatal(Form("Invalid field map for constant field %d",fMap));
   }
 }
 
+
+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];
+
+    if (fCompensator && (x[2] > 919. && x[2] < 1231.) && rad2 < 16.) {
+      // Compensator magnet at z = 1075 m 
+       b[0] = 10.9;
+       b[1] = 0.;
+       b[2] = 0.;
+       return;
+    }
+    
+    
+    if(x[2] < kCORBEG2 && x[2] > kCOREND2){
+       if(rad2<kCOR2RA2){
+           b[0] = - kFCORN2;
+       }
+    }
+    else if(x[2] < kZ1BEG && x[2] > kZ1END){  
+       if(rad2<kZ1RA2){
+           b[0] =  kG1*x[1];
+           b[1] =  kG1*x[0];
+       }
+    }
+    else if(x[2] < kZ2BEG && x[2] > kZ2END){  
+       if(rad2<kZ2RA2){
+           b[0] = -kG1*x[1];
+           b[1] = -kG1*x[0];
+       }
+    }
+    else if(x[2] < kZ3BEG && x[2] > kZ3END){  
+       if(rad2<kZ3RA2){
+           b[0] = -kG1*x[1];
+           b[1] = -kG1*x[0];
+       }
+    }
+    else if(x[2] < kZ4BEG && x[2] > kZ4END){  
+       if(rad2<kZ4RA2){
+           b[0] =  kG1*x[1];
+           b[1] =  kG1*x[0];
+       }
+    }
+    else if(x[2] < kD1BEG && x[2] > kD1END){ 
+       if(rad2<kD1RA2){
+           b[1] = -kFDIP;
+       }
+    }
+    else if(x[2] < kD2BEG && x[2] > kD2END){
+       if(((x[0]-kXCEN1D2)*(x[0]-kXCEN1D2)+(x[1]-kYCEN1D2)*(x[1]-kYCEN1D2))<kD2RA2
+          || ((x[0]-kXCEN2D2)*(x[0]-kXCEN2D2)+(x[1]-kYCEN2D2)*(x[1]-kYCEN2D2))<kD2RA2){
+           b[1] = kFDIP;
+       }
+    }
+    
+}