X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliMagFC.cxx;h=4a1f2958a54a62c4684d31148da247443c51c978;hb=c48f9ca243a3ba4f037d9227d45eea4afcc2919c;hp=f424acae354e655611cdfa0577407b093eafbb98;hpb=6f3038e961c0d56469731b823edf10e828b99e2b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index f424acae354..4a1f2958a54 100644
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 
+#include "AliLog.h"
 #include "AliMagFC.h"
 
 ClassImp(AliMagFC)
@@ -30,7 +31,8 @@ ClassImp(AliMagFC)
 //________________________________________
 AliMagFC::AliMagFC(const char *name, const char *title, Int_t integ, 
 		   Float_t factor, Float_t fmax)
-  : AliMagF(name,title,integ,factor,fmax)
+    : AliMagF(name,title,integ,factor,fmax),
+      fCompensator(kFALSE)
 {
   // 
   // Standard constructor
@@ -64,8 +66,7 @@ void AliMagFC::Field(Float_t *x, Float_t *b) const
 	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));
   }
 }
 
@@ -73,8 +74,17 @@ void AliMagFC::Field(Float_t *x, Float_t *b) const
 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];
+    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;
@@ -83,25 +93,25 @@ void AliMagFC::ZDCField(Float_t *x, Float_t *b) const
     else if(x[2] < kZ1BEG && x[2] > kZ1END){  
 	if(rad2<kZ1RA2){
 	    b[0] =  kG1*x[1];
-	    b[1] = -kG1*x[0];
+	    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];
+	    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];
+	    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];
+	    b[1] =  kG1*x[0];
 	}
     }
     else if(x[2] < kD1BEG && x[2] > kD1END){ 
@@ -116,4 +126,48 @@ void AliMagFC::ZDCField(Float_t *x, Float_t *b) const
 	}
     }
     
+// *************************** LEFT LINE ***********************************************
+    
+    if(x[2] > kCORBEG2l && x[2] < kCOREND2l){
+	if(rad2<kCOR2RA2l){
+	    b[0] = kFCORN2l;
+	}
+    }          
+    else if(x[2] > kZ1BEGl && x[2] < kZ1ENDl){  
+	if(rad2<kZ1RA2l){
+	// First quadrupole of inner triplet de-focussing in x-direction
+	    b[0] = -kG1l*x[1];
+	    b[1] = -kG1l*x[0];
+	}
+    }
+    else if(x[2] > kZ2BEGl && x[2] < kZ2ENDl){  
+	if(rad2<kZ2RA2l){
+	    b[0] = kG1l*x[1];
+	    b[1] = kG1l*x[0];
+	}
+    }
+    else if(x[2] > kZ3BEGl && x[2] < kZ3ENDl){  
+	if(rad2<kZ3RA2l){
+	    b[0] = kG1l*x[1];
+	    b[1] = kG1l*x[0];
+	}
+    }
+    else if(x[2] > kZ4BEGl && x[2] < kZ4ENDl){  
+	if(rad2<kZ4RA2l){
+	    b[0] = -kG1l*x[1];
+	    b[1] = -kG1l*x[0];
+	}
+    }
+    else if(x[2] > kD1BEGl && x[2] < kD1ENDl){ 
+	if(rad2<kD1RA2l){
+	    b[1] = kFDIPl;
+	}
+    }
+    else if(x[2] > kD2BEGl && x[2] < kD2ENDl){
+	if(((x[0]-kXCEN1D2l)*(x[0]-kXCEN1D2l)+(x[1]-kYCEN1D2l)*(x[1]-kYCEN1D2l))<kD2RA2l
+	   || ((x[0]-kXCEN2D2l)*(x[0]-kXCEN2D2l)+(x[1]-kYCEN2D2l)*(x[1]-kYCEN2D2l))<kD2RA2l){
+	    b[1] = -kFDIPl;
+	}
+    }
+    
 }