Replacing array of objects by array of pointers

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

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index 073ee052e238ebbc4054c96667208b297fafac19..0233b0296865c9c8f21ef2f3f1aa6fb0adcaca31 100644 (file)
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -13,17 +13,24 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/* $Header$ */
+/* $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 Float_t factor, const Float_t fmax)
+AliMagFC::AliMagFC(const char *name, const char *title, Int_t integ, 
+                  Float_t factor, Float_t fmax)
   : AliMagF(name,title,integ,factor,fmax)
 {
   // 
@@ -31,12 +38,10 @@ AliMagFC::AliMagFC(const char *name, const char *title, const Int_t integ,
   //
   fType = kConst;
   fMap  = 1;
-  printf("Constant Field %s created: map= %d, factor= %f\n",fName.Data(),fMap,
-        factor);
 }
 
 //________________________________________
-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
@@ -46,64 +51,69 @@ 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(x[2]>kCORBEG2 && x[2]<kCOREND2){
-      if(rad2<kCOR2RA2){
-        b[0] = kFCORN2;
+         ZDCField(x, b);
       }
     }
-    else if(x[2]>kZ1BEG && x[2]<kZ1END){  
-      if(rad2<kZ1RA2){
-        b[0] = -kG1*x[1];
-        b[1] = -kG1*x[0];
-      }
+    if(fFactor!=1) {
+       b[0]*=fFactor;
+       b[1]*=fFactor;
+       b[2]*=fFactor;
     }
-    else if(x[2]>kZ2BEG && x[2]<kZ2END){  
-      if(rad2<kZ2RA2){
-        b[0] = kG1*x[1];
-        b[1] = kG1*x[0];
-      }
+  } else {
+      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(x[2] < kCORBEG2 && x[2] > kCOREND2){
+       if(rad2<kCOR2RA2){
+           b[0] = - kFCORN2;
+       }
     }
-    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] < kZ1BEG && x[2] > kZ1END){  
+       if(rad2<kZ1RA2){
+           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] < kZ2BEG && x[2] > kZ2END){  
+       if(rad2<kZ2RA2){
+           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] < kZ3BEG && x[2] > kZ3END){  
+       if(rad2<kZ3RA2){
+           b[0] = -kG1*x[1];
+           b[1] = -kG1*x[0];
+       }
     }
-    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;
-      }
+    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;
+       }
     }
-    if(fFactor!=1) {
-      b[0]*=fFactor;
-      b[1]*=fFactor;
-      b[2]*=fFactor;
+    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;
+       }
     }
-  } else {
-    printf("Invalid field map for constant field %d\n",fMap);
-    exit(1);
-  }
+    
 }
-