Changed the call to the QA data maker in AliSimulation

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

diff --git a/STEER/AliFieldMap.cxx b/STEER/AliFieldMap.cxx
index c2ae56d161eece8d7d32f330739118bb64da3409..907d5c4523f83a2837316662887d194d9aa38b7d 100644 (file)
--- a/STEER/AliFieldMap.cxx
+++ b/STEER/AliFieldMap.cxx
@@ -17,13 +17,18 @@
 
 //-----------------------------------------------------------------------
 //
+// Class to handle the field
+// I/O and interpolation
+// of the field map to return the value
+// of the magnetic field in an arbitrary position
 // Author: Andreas Morsch <andreas.morsch@cern.ch>
 //
 //-----------------------------------------------------------------------
 
+#include <TClass.h>
 #include <TSystem.h>
-#include <TVector.h>
 
+#include "AliLog.h"
 #include "AliFieldMap.h"
 
 ClassImp(AliFieldMap)
@@ -131,8 +136,8 @@ void AliFieldMap::ReadField()
   Int_t   ix, iy, iz, ipx, ipy, ipz;
   Float_t bx, by, bz;
   char *fname = 0;
-  printf("%s: Reading Magnetic Field Map %s from file %s\n",
-        ClassName(),fName.Data(),fTitle.Data());
+  AliInfo(Form("Reading Magnetic Field Map %s from file %s",
+              fName.Data(),fTitle.Data()));
 
   fname   = gSystem->ExpandPathName(fTitle.Data());
   magfile = fopen(fname,"r");
@@ -205,7 +210,7 @@ void AliFieldMap::ReadField()
 }
 
 //_______________________________________________________________________
-void AliFieldMap::Field(Float_t *x, Float_t *b)
+void AliFieldMap::Field(Float_t *x, Float_t *b) const
 {
   //
   // Use simple interpolation to obtain field at point x
@@ -217,19 +222,19 @@ void AliFieldMap::Field(Float_t *x, Float_t *b)
     b[0]=b[1]=b[2]=0;
     //
     
-    xl[0]=TMath::Abs(x[0])-fXbeg;
-    xl[1]=TMath::Abs(x[1])-fYbeg;
-    xl[2]=x[2]-fZbeg;
+    xl[0] = x[0] - fXbeg;
+    xl[1] = x[1] - fYbeg;
+    xl[2] = x[2] - fZbeg;
     
-    hix=xl[0]*fXdeli;
+    hix=TMath::Max(0.,TMath::Min(xl[0]*fXdeli,fXn-1.0001));
     ratx=hix-int(hix);
     ix=int(hix);
     
-    hiy=xl[1]*fYdeli;
+    hiy=TMath::Max(0.,TMath::Min(xl[1]*fYdeli,fYn-1.0001));
     raty=hiy-int(hiy);
     iy=int(hiy);
     
-    hiz=xl[2]*fZdeli;
+    hiz=TMath::Max(0.,TMath::Min(xl[2]*fZdeli,fZn-1.0001));
     ratz=hiz-int(hiz);
     iz=int(hiz);
 
@@ -237,6 +242,8 @@ void AliFieldMap::Field(Float_t *x, Float_t *b)
     raty1=kone-raty;
     ratz1=kone-ratz;
 
+    if (!fB) return;
+
     bhyhz = Bx(ix  ,iy+1,iz+1)*ratx1+Bx(ix+1,iy+1,iz+1)*ratx;
     bhylz = Bx(ix  ,iy+1,iz  )*ratx1+Bx(ix+1,iy+1,iz  )*ratx;
     blyhz = Bx(ix  ,iy  ,iz+1)*ratx1+Bx(ix+1,iy  ,iz+1)*ratx;
@@ -263,12 +270,12 @@ void AliFieldMap::Field(Float_t *x, Float_t *b)
 }
 
 //_______________________________________________________________________
-void AliFieldMap::Copy(AliFieldMap & /* magf */) const
+void AliFieldMap::Copy(TObject & /* magf */) const
 {
   //
   // Copy *this onto magf -- Not implemented
   //
-  Fatal("Copy","Not implemented!\n");
+  AliFatal("Not implemented!");
 }
 
 //_______________________________________________________________________