syntax correction for Mylar

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

diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx
index 88067e5cbb7491570f1f02af2187ef645907d3ec..269ce397f3d8db5bdb59658ce099dfe4bff04494 100644 (file)
--- a/STEER/AliMagFDM.cxx
+++ b/STEER/AliMagFDM.cxx
@@ -16,17 +16,14 @@
 /* $Id$ */
 
 //-------------------------------------------------------------------------
-//
 //   Field with Magnetic Field map
-//
+//   Used by AliRun class
+//   Author:
 //-------------------------------------------------------------------------
 
-#include <stdlib.h>
-
 #include "TSystem.h"
 
 #include "AliMagFDM.h"
-    
 
 ClassImp(AliMagFDM)
 
@@ -65,9 +62,9 @@ AliMagFDM::AliMagFDM():
 }
 
 //_______________________________________________________________________
-AliMagFDM::AliMagFDM(const char *name, const char *title, const Int_t integ,
-                     const Float_t factor, const Float_t fmax):
-  AliMagF(name,title,integ,factor,fmax),
+AliMagFDM::AliMagFDM(const char *name, const char *title, Int_t integ,
+                     Float_t factor, Float_t fmax):
+  AliMagFC(name,title,integ,factor,fmax),
   fSolenoid(0),
   fInd(0),
   fZmin(0),
@@ -109,7 +106,7 @@ AliMagFDM::AliMagFDM(const char *name, const char *title, const Int_t integ,
 }
 
 //_______________________________________________________________________
-void AliMagFDM::Field(Float_t *xfi, Float_t *b)
+void AliMagFDM::Field(Float_t *xfi, Float_t *b) const
 {
   //
   // Main routine to compute the field in a point
@@ -140,11 +137,15 @@ void AliMagFDM::Field(Float_t *xfi, Float_t *b)
   Double_t zz1, zz2,yy1,yy2,x2,x1; 
      
 // --- start the map fiel from z = 502.92 cm ---
+//
+// This map has been calculated in a coordinate system in which the muon spectrometer sits at z > 0
+// Transfor correspondingly.
 
-  x[0] = xfi[0];
-  x[1] = xfi[1];
-  x[2] = xfi[2];
+  x[0] = - xfi[0];
+  x[1] =   xfi[1];
+  x[2] = - xfi[2];
   b[0]=b[1]=b[2]=0;
+//
   //       printf("x[0]  %f,x[1] %f,x[2]  %f\n",x[0],x[1],x[2]); 
 
   Double_t rr=TMath::Sqrt(x[0]*x[0]+x[1]*x[1]);
@@ -259,9 +260,9 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
         }
        }
 
-       b[0]=bint[0];
+       b[0]=-bint[0];
        b[1]=bint[1];
-       b[2]=bint[2];
+       b[2]=-bint[2];
 
    }  
    else 
@@ -309,9 +310,9 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
        bint[jb-3] = Bb(zz1,zz2,yy1,yy2,x1,x2,iKvar,k0, l0, m0)*10 ; 
      }    
  
-   b[0]=bint[0];
+   b[0]=-bint[0];
    b[1]=bint[1];
-   b[2]=bint[2]; 
+   b[2]=-bint[2]; 
 
    } 
 
@@ -321,51 +322,9 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
  }
            
 } else {
+    ZDCField(xfi,b);
 
-//This is the ZDC part
-    Float_t rad2=x[0]*x[0]+x[1]*x[1];
-    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;
-      }
-    }
-      }
-    
 
   if(fFactor!=1) {
     b[0]*=fFactor;
@@ -375,8 +334,8 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
 }
 
 //_______________________________________________________________________
-Int_t AliMagFDM::FZ(Double_t temp, Float_t *Ar, 
-                    Float_t delu, Int_t ik,Int_t nk) const
+Int_t AliMagFDM::FZ(Double_t temp, const Float_t *Ar, 
+                    Float_t delu, Int_t ik, Int_t nk) const
 {
   //
   // Quest of a point position at x,y,z (Cartensian) and R,Phi,z (Polar) axises
@@ -409,15 +368,15 @@ Int_t AliMagFDM::FZ(Double_t temp, Float_t *Ar,
 //_______________________________________________________________________
 Double_t AliMagFDM::Ba(Int_t kaai,Double_t zaa1, Double_t zaa2, 
                        Double_t alf1, Double_t alf2, Double_t alf3, 
-                       Int_t kaa, Int_t maa)
+                       Int_t kaa, Int_t maa) const
 {
   //
   // Calculation of field componet for case (keps <r0<= fRdel) at a given axis
   //
-  Double_t fa11,fa12,fa13;
-  Double_t fa21,fa22,fa23;
-  Double_t faY1,faY2;
-  Double_t bba;
+  Double_t fa11=0,fa12=0,fa13=0;
+  Double_t fa21=0,fa22=0,fa23=0;
+  Double_t faY1=0,faY2=0;
+  Double_t bba=0;
 
   switch (kaai) {
   case 0:
@@ -446,7 +405,6 @@ Double_t AliMagFDM::Ba(Int_t kaai,Double_t zaa1, Double_t zaa2,
     break;
   default:
     Fatal("Ba","Invalid value of kaai %d\n",kaai);
-    exit(1);
   }                            
   faY1=alf1*fa11+alf2*fa12+alf3*fa13;
   faY2=alf1*fa21+alf2*fa22+alf3*fa23;
@@ -457,16 +415,16 @@ Double_t AliMagFDM::Ba(Int_t kaai,Double_t zaa1, Double_t zaa2,
   
 //_______________________________________________________________________
 Double_t AliMagFDM::Bb(Double_t z1,Double_t z2, Double_t y1,Double_t y2, 
-                       Double_t x1,Double_t x2, Int_t kv, Int_t k, Int_t l, Int_t m)
+                       Double_t x1,Double_t x2, Int_t kv, Int_t k, Int_t l, Int_t m) const
 {  
   //
   // Calculation of field componet at a given axis (general case)
   //
-  Double_t fy1, fy2, ffy;
-  Double_t gy1,gy2,ggy;
-  Double_t bbi;
-  Double_t bf11,bf12,bf21,bf22;
-  Double_t bg11,bg12,bg21,bg22;
+  Double_t fy1=0,fy2=0,ffy=0;
+  Double_t gy1=0,gy2=0,ggy=0;
+  Double_t bbi=0;
+  Double_t bf11=0,bf12=0,bf21=0,bf22=0;
+  Double_t bg11=0,bg12=0,bg21=0,bg22=0;
 
   
   /*-----------------Polar part ------------------*/
@@ -547,7 +505,6 @@ Double_t AliMagFDM::Bb(Double_t z1,Double_t z2, Double_t y1,Double_t y2,
 
   default:
     Fatal("Bb","Invalid value of kv %d\n",kv);
-    exit(1);
   }  
   
   
@@ -726,7 +683,6 @@ printf("fZpdl %e, fPhid %e, fRdel %e, fZpmx %e, fZpmn %e,fRmax %e,fRmin %e \n",
     }
 //
   } else { 
-    printf("File %s not found !\n",fTitle.Data());
-    exit(1);
+    Fatal("ReadField","File %s not found !\n",fTitle.Data());
   }
 }