X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliMagFDM.cxx;h=056aed15f01557ce4649cbaed9d8e14e50272fbd;hb=116cbefdd457541a56d5dfd1a53b09c3ccc50964;hp=350ebb7cb53a3108792b7a85a819066a82121059;hpb=fb17acd412e4de1f64fd41bde1684280cacc9016;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx
index 350ebb7cb53..056aed15f01 100644
--- a/STEER/AliMagFDM.cxx
+++ b/STEER/AliMagFDM.cxx
@@ -15,6 +15,12 @@
 
 /* $Header$ */
 
+//-------------------------------------------------------------------------
+//
+//   Field with Magnetic Field map
+//
+//-------------------------------------------------------------------------
+
 #include <stdlib.h>
 
 #include "TSystem.h"
@@ -109,7 +115,7 @@ void AliMagFDM::Field(Float_t *xfi, Float_t *b)
   // Main routine to compute the field in a point
   //
   const Double_t keps=0.1E-06;
-  const Double_t PI2=2.*TMath::Pi();
+  const Double_t kPI2=2.*TMath::Pi();
   const Double_t kone=1;
   
   const    Int_t  kiip=33; 
@@ -200,10 +206,10 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
         kcphi=777;
        } 
        ph0=TMath::ACos(cphi);
-       if (xL3[0] < 0 && yyp > 0 ) {ph0=PI2/2 - ph0;}  
-       if (xL3[0] < 0 && yyp < 0 ) {ph0=PI2/2 + ph0;} 
-       if (xL3[0] > 0 && yyp < 0 ) {ph0=PI2 - ph0;}  
-       if (ph0 > PI2) {       ph0=ph0 - PI2;}
+       if (xL3[0] < 0 && yyp > 0 ) {ph0=kPI2/2 - ph0;}  
+       if (xL3[0] < 0 && yyp < 0 ) {ph0=kPI2/2 + ph0;} 
+       if (xL3[0] > 0 && yyp < 0 ) {ph0=kPI2 - ph0;}  
+       if (ph0 > kPI2) {       ph0=ph0 - kPI2;}
        if (kcphi==777) {
         printf("xL3[0] %e, xL3[1] %e, xL3[2] %e, yyp %e, r0 %e, ph0 %e\n",xL3[0],xL3[1],xL3[2],yyp,r0,ph0);
        }  
@@ -370,7 +376,7 @@ 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)
+                    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