Change of coordinate system x->-x, z->-z

diff --git a/STEER/AliMagFCM.cxx b/STEER/AliMagFCM.cxx
index b11a19e95146f6e07a7d8fcdb1033ba295f6d15b..fdd2f8218aad04f3a8194b2bbf72949cba2ee5cf 100644 (file)
--- a/STEER/AliMagFCM.cxx
+++ b/STEER/AliMagFCM.cxx
@@ -56,7 +56,7 @@ AliMagFCM::AliMagFCM():
 //_______________________________________________________________________
 AliMagFCM::AliMagFCM(const char *name, const char *title, const Int_t integ, 
                      const Float_t factor, const Float_t fmax):
-  AliMagF(name,title,integ,factor,fmax),
+  AliMagFC(name,title,integ,factor,fmax),
   fXbeg(0),
   fYbeg(0),
   fZbeg(0),
@@ -86,7 +86,7 @@ AliMagFCM::AliMagFCM(const char *name, const char *title, const Int_t integ,
 
 //_______________________________________________________________________
 AliMagFCM::AliMagFCM(const AliMagFCM &magf):
-  AliMagF(magf),
+  AliMagFC(magf),
   fXbeg(0),
   fYbeg(0),
   fZbeg(0),
@@ -122,16 +122,24 @@ void AliMagFCM::Field(Float_t *x, Float_t *b)
   // --- find the position in the grid ---
   
   b[0]=b[1]=b[2]=0;
-  if(-700<x[2] && x[2]<fZbeg && x[0]*x[0]+(x[1]+30)*(x[1]+30) < 560*560) {
-    b[2]= fSolenoid;
+
+  
+  if(-700 < -x[2] && -x[2] < fZbeg && x[0] * x[0] +(x[1]+30)*(x[1]+30) < 560*560) {
+    b[2]=  fSolenoid;
   } else  {
-    Bool_t infield=(fZbeg<=x[2] && x[2]<fZbeg+fZdel*(fZn-1)
-                   &&  ( fXbeg <= TMath::Abs(x[0]) && TMath::Abs(x[0]) < fXbeg+fXdel*(fXn-1) )
-                   &&  ( fYbeg <= TMath::Abs(x[1]) && TMath::Abs(x[1]) < fYbeg+fYdel*(fYn-1) ));
+      // The field map used here was calculated in a coordinate system where the muon arm is at z > 0
+      // Transfom x -> -x and z -> -z 
+      Float_t xm = - x[0];
+      Float_t ym =   x[1];
+      Float_t zm = - x[2];
+ 
+      Bool_t infield=(fZbeg <= zm  && zm < fZbeg+fZdel*(fZn-1)
+                     &&  ( fXbeg <= TMath::Abs(xm) && TMath::Abs(xm) < fXbeg+fXdel*(fXn-1) )
+                     &&  ( fYbeg <= TMath::Abs(ym) && TMath::Abs(ym) < fYbeg+fYdel*(fYn-1) ));
     if(infield) {
-      xl[0]=TMath::Abs(x[0])-fXbeg;
-      xl[1]=TMath::Abs(x[1])-fYbeg;
-      xl[2]=x[2]-fZbeg;
+      xl[0]=TMath::Abs(xm)-fXbeg;
+      xl[1]=TMath::Abs(ym)-fYbeg;
+      xl[2]=zm-fZbeg;
       
       // --- start with x
       
@@ -179,62 +187,25 @@ void AliMagFCM::Field(Float_t *x, Float_t *b)
        //ratx,raty,ratz,b[0],b[1],b[2]);
        //
        // ... use the dipole symmetry
-       if (x[0]*x[1] < 0) b[1]=-b[1];
-       if (x[0]<0) b[2]=-b[2];
+       if (xm*ym < 0) b[1]=-b[1];
+       if (xm<0)      b[2]=-b[2];
+       b[0] = -b[0];
+       b[2] = -b[2];
+       
       } else {
        printf("Invalid field map for constant mesh %d\n",fMap);
       }
     } else {
 //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;
-      }
+       ZDCField(x,b);
     }
     
+    if(fFactor!=1) {
+       b[0]*=fFactor;
+       b[1]*=fFactor;
+       b[2]*=fFactor;
     }
   }
-  if(fFactor!=1) {
-    b[0]*=fFactor;
-    b[1]*=fFactor;
-    b[2]*=fFactor;
-  }
 }
 
 //_______________________________________________________________________

diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h
index 5d0b0e7bcc950c16b46d06dbe95ba84ae493b64a..89e0a4303659142a477d26033e4415a6a349df1e 100644 (file)
--- a/STEER/AliMagFCM.h
+++ b/STEER/AliMagFCM.h
@@ -5,10 +5,10 @@
 
 /* $Id$ */
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
 class TVector;
 
-class AliMagFCM : public AliMagF
+class AliMagFCM : public AliMagFC
 {
   //Alice Magnetic Field with constant mesh
 

diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx
index ecee137df538bf64698ab2508b6ae6c3b8fd0a43..fb82a36acfe958f9825116cc8a7ca900029c1363 100644 (file)
--- a/STEER/AliMagFDM.cxx
+++ b/STEER/AliMagFDM.cxx
@@ -26,7 +26,6 @@
 #include "TSystem.h"
 
 #include "AliMagFDM.h"
-    
 
 ClassImp(AliMagFDM)
 
@@ -67,7 +66,7 @@ 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),
+  AliMagFC(name,title,integ,factor,fmax),
   fSolenoid(0),
   fInd(0),
   fZmin(0),
@@ -140,11 +139,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 +262,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 +312,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 +324,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;

diff --git a/STEER/AliMagFDM.h b/STEER/AliMagFDM.h
index 1ed8223b5a48e26f1001b93330f10b9d2cd981a4..0b3636b366c2835f6e0d75c7ff03636b159e1ebe 100644 (file)
--- a/STEER/AliMagFDM.h
+++ b/STEER/AliMagFDM.h
@@ -5,9 +5,9 @@
 
 /* $Id$ */
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
 //
-class AliMagFDM : public AliMagF
+class AliMagFDM : public AliMagFC
 {
 //Alice Magnetic Field:Magnetic field map from IP to muon filter for Muon arm
 
@@ -28,8 +28,8 @@ public:
 protected:
 
 //
-  Float_t    fSolenoid; // Solenoid Field Strength
-  Int_t      fInd;      // Character number of validity Map region
+  Float_t fSolenoid; // Solenoid Field Strength
+  Int_t   fInd;      // Character number of validity Map region
 
   Float_t fZmin;  // Start of the cartesian  part  of MAP in z
   Float_t fZmax;  // End of Map in z   

diff --git a/STEER/AliMagFMaps.cxx b/STEER/AliMagFMaps.cxx
index 97a9fa22a38ca36265b783f2027c1e003b3dcc14..893447067a27ca9bf4ae235a483623d8b6d28de1 100644 (file)
--- a/STEER/AliMagFMaps.cxx
+++ b/STEER/AliMagFMaps.cxx
@@ -29,7 +29,6 @@
 #include "AliFieldMap.h"
 #include "AliMagFMaps.h"
 
-
 ClassImp(AliMagFMaps)
 
 //_______________________________________________________________________
@@ -49,7 +48,7 @@ AliMagFMaps::AliMagFMaps():
 AliMagFMaps::AliMagFMaps(const char *name, const char *title, const Int_t integ, 
                          const Float_t factor, const Float_t fmax, const Int_t map, 
                          const Int_t l3):
-  AliMagF(name,title,integ,factor,fmax),
+  AliMagFC(name,title,integ,factor,fmax),
   fSolenoid(0),
   fSolenoidUser(0),
   fL3Option(l3),
@@ -72,7 +71,7 @@ AliMagFMaps::AliMagFMaps(const char *name, const char *title, const Int_t integ,
 
 //_______________________________________________________________________
 AliMagFMaps::AliMagFMaps(const AliMagFMaps &magf):
-  AliMagF(magf),
+  AliMagFC(magf),
   fSolenoid(0),
   fL3Option(0),
   fFieldRead(0)
@@ -209,11 +208,24 @@ void AliMagFMaps::Field(Float_t *x, Float_t *b)
   //
   // --- find the position in the grid ---
   
-  if (!fFieldRead) ReadField();
+
+    
+    if (!fFieldRead) ReadField();
+
+  //
+  // Field Maps have been calculated for the coordinate system in which 
+  // the Muon Spectrometer is placed at z > 0
+  // Transform coordinates corresponingly 
+  //
   
   b[0]=b[1]=b[2]=0;
+  Float_t xm[3];
+  xm[0] = - x[0];
+  xm[1] =   x[1];
+  xm[2] = - x[2];
+  
   AliFieldMap* map = 0;
-  if (fFieldMap[0]->Inside(x[0], x[1], x[2])) {
+  if (fFieldMap[0]->Inside(xm[0], xm[1], xm[2])) {
       map = fFieldMap[0];
       if (!fL3Option) {
       //
@@ -222,60 +234,27 @@ void AliMagFMaps::Field(Float_t *x, Float_t *b)
          b[2] = fSolenoidUser;
          return;
     }
-  } else if (fFieldMap[1]->Inside(x[0], x[1], x[2])) {
+  } else if (fFieldMap[1]->Inside(xm[0], xm[1], xm[2])) {
     map = fFieldMap[1];
-  } else if (fFieldMap[2]->Inside(x[0], x[1], x[2])) {
+  } else if (fFieldMap[2]->Inside(xm[0], xm[1], xm[2])) {
     map = fFieldMap[2];
   }
   
   if(map){
-    map->Field(x,b);
+    map->Field(xm,b);
+    b[0] = - b[0];
+    b[2] = - b[2];
+
   } else {
-    //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;
-       }
-    }
+      //This is the ZDC part
+      ZDCField(x, b);
   }
+
+  
   if(fFactor!=1) {
-    b[0]*=fFactor;
-    b[1]*=fFactor;
-    b[2]*=fFactor;
+      b[0]*=fFactor;
+      b[1]*=fFactor;
+      b[2]*=fFactor;
   }
 }
 

diff --git a/STEER/AliMagFMaps.h b/STEER/AliMagFMaps.h
index eafcd1e9277c88b61f4f128a1dacb0d58e40f3a1..362d0ed80554e0bbb9f4e45024383b5055020604 100644 (file)
--- a/STEER/AliMagFMaps.h
+++ b/STEER/AliMagFMaps.h
@@ -9,10 +9,10 @@
 // Author: Andreas Morsch <andreas.morsch@cern.ch>
 //
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
 class AliFieldMap;
 
-class AliMagFMaps : public AliMagF
+class AliMagFMaps : public AliMagFC
 {
   //Alice Magnetic Field with constant mesh