Make Field(...) const as suggested by FCA.

diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx
index 82ee3bb7239997fdc3765ce38855696af3d17bd1..345bfd83cf8c2d1c5a16aa54c7321a793441d0cc 100644 (file)
--- a/STEER/AliMagF.cxx
+++ b/STEER/AliMagF.cxx
@@ -67,7 +67,7 @@ AliMagF::AliMagF(const char *name, const char *title, Int_t integ,
 }
 
 //_______________________________________________________________________
-void AliMagF::Field(Float_t*, Float_t *b)
+void AliMagF::Field(Float_t*, Float_t *b) const
 {
   //
   // Method to return the field in one point -- dummy in this case

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 6bf3de6bc2fe68fe6717e116e50f2d36a61c69a4..bb84b150665e8f9e5c2cbd1418f8f191f2e0c386 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -22,7 +22,7 @@ public:
   AliMagF(const char *name, const char *title, Int_t integ, 
          Float_t factor = 1., Float_t fmax = 10.);
   virtual ~AliMagF() {}
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual Int_t Type() const {return fType;}
   virtual Float_t Max() const {return fMax;}
   virtual Int_t Map() const {return fMap;}

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index beffc526dcc1141fb99b9b468b58c33549494e06..f424acae354e655611cdfa0577407b093eafbb98 100644 (file)
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -40,7 +40,7 @@ AliMagFC::AliMagFC(const char *name, const char *title, Int_t integ,
 }
 
 //________________________________________
-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
@@ -70,7 +70,7 @@ void AliMagFC::Field(Float_t *x, Float_t *b)
 }
 
 
-void AliMagFC::ZDCField(Float_t *x, Float_t *b)
+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];

diff --git a/STEER/AliMagFC.h b/STEER/AliMagFC.h
index 3d50bcea736ed49fd44fbf6e9fa77d812cbedf37..5580f8adcf4b02e70be2f9b230ec73c491e4396e 100644 (file)
--- a/STEER/AliMagFC.h
+++ b/STEER/AliMagFC.h
@@ -22,9 +22,9 @@ public:
   AliMagFC(const char *name, const char *title, Int_t integ, 
           Float_t factor, Float_t fmax);
   virtual ~AliMagFC() {}
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual void ReadField() {}
-  virtual void ZDCField(Float_t *x, Float_t *b);
+  virtual void ZDCField(Float_t *x, Float_t *b) const;
   ClassDef(AliMagFC,1)  //Class for all Alice Constant MagField 
 };
 

diff --git a/STEER/AliMagFCM.cxx b/STEER/AliMagFCM.cxx
index 4b0a1fdc5c605f96477757f8e7320924fc83a7b9..903cc454bcaa29b694158b4449c608272ecffc40 100644 (file)
--- a/STEER/AliMagFCM.cxx
+++ b/STEER/AliMagFCM.cxx
@@ -110,7 +110,7 @@ AliMagFCM::AliMagFCM(const AliMagFCM &magf):
 }
 
 //_______________________________________________________________________
-void AliMagFCM::Field(Float_t *x, Float_t *b)
+void AliMagFCM::Field(Float_t *x, Float_t *b) const
 {
   //
   // Method to calculate the magnetic field

diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h
index 18ea9594bf84ac392b5c944d736491a13bd5f3f6..6779400c8277e4948d1642a4cdf119acbe4d2798 100644 (file)
--- a/STEER/AliMagFCM.h
+++ b/STEER/AliMagFCM.h
@@ -24,7 +24,7 @@ public:
           Float_t factor, Float_t fmax);
   AliMagFCM(const AliMagFCM &mag);
   virtual ~AliMagFCM() {delete fB;}
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual void ReadField();
   virtual void    SetSolenoidField(Float_t field = 2.) {fSolenoid = field;}
   virtual Float_t SolenoidField() const {return fSolenoid;}

diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx
index 7e9bfa2f8254caf14d097a49c03d3445d61471c6..f5b2b98e7120b3f791080172886b4d4113a6dc7a 100644 (file)
--- a/STEER/AliMagFDM.cxx
+++ b/STEER/AliMagFDM.cxx
@@ -106,7 +106,7 @@ AliMagFDM::AliMagFDM(const char *name, const char *title, Int_t integ,
 }
 
 //_______________________________________________________________________
-void AliMagFDM::Field(Float_t *xfi, Float_t *b)
+void AliMagFDM::Field(Float_t *xfi, Float_t *b) const
 {
   //
   // Main routine to compute the field in a point
@@ -334,8 +334,8 @@ 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) const
+Int_t AliMagFDM::FZ(Double_t temp, const Float_t *Ar, 
+                    const Float_t delu, Int_t ik, const Int_t nk) const
 {
   //
   // Quest of a point position at x,y,z (Cartensian) and R,Phi,z (Polar) axises
@@ -368,7 +368,7 @@ Int_t AliMagFDM::FZ(Double_t temp, Float_t *Ar,
 //_______________________________________________________________________
 Double_t AliMagFDM::Ba(Int_t kaai,Double_t zaa1, Double_t zaa2, 
                        Double_t alf1, Double_t alf2, Double_t alf3, 
-                       Int_t kaa, Int_t maa)
+                       Int_t kaa, Int_t maa) const
 {
   //
   // Calculation of field componet for case (keps <r0<= fRdel) at a given axis
@@ -415,7 +415,7 @@ Double_t AliMagFDM::Ba(Int_t kaai,Double_t zaa1, Double_t zaa2,
   
 //_______________________________________________________________________
 Double_t AliMagFDM::Bb(Double_t z1,Double_t z2, Double_t y1,Double_t y2, 
-                       Double_t x1,Double_t x2, Int_t kv, Int_t k, Int_t l, Int_t m)
+                       Double_t x1,Double_t x2, Int_t kv, Int_t k, Int_t l, Int_t m) const
 {  
   //
   // Calculation of field componet at a given axis (general case)

diff --git a/STEER/AliMagFDM.h b/STEER/AliMagFDM.h
index 4e4ed938cfbae2e25ea4278c00eebe755e5154b8..2c2c54a093ebf44963d38008a96a5c1fd29f6954 100644 (file)
--- a/STEER/AliMagFDM.h
+++ b/STEER/AliMagFDM.h
@@ -22,13 +22,13 @@ public:
   AliMagFDM(const char *name, const char *title, Int_t integ,
            Float_t factor, Float_t fmax);
   virtual ~AliMagFDM(){} 
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual void ReadField(); 
   virtual void SetSolenoidField(Float_t field = 2.) {fSolenoid = field;}
   virtual Float_t SolenoidField() const {return fSolenoid;}
-  Int_t FZ(Double_t u, Float_t *Ar, Float_t du, Int_t ki, Int_t nu) const;
-  Double_t Ba(Int_t kai, Double_t za1, Double_t za2, Double_t al1, Double_t al2, Double_t al3, Int_t ka, Int_t ma);
-  Double_t Bb(Double_t z1, Double_t z2, Double_t y1, Double_t y2, Double_t x1, Double_t x2, Int_t kvr, Int_t k, Int_t l, Int_t m); 
+  Int_t FZ(Double_t u, const Float_t *Ar, const Float_t du, Int_t ki, const Int_t nu) const;
+  Double_t Ba(Int_t kai, Double_t za1, Double_t za2, Double_t al1, Double_t al2, Double_t al3, Int_t ka, Int_t ma) const;
+  Double_t Bb(Double_t z1, Double_t z2, Double_t y1, Double_t y2, Double_t x1, Double_t x2, Int_t kvr, Int_t k, Int_t l, Int_t m) const; 
 
 
 protected:

diff --git a/STEER/AliMagFMaps.cxx b/STEER/AliMagFMaps.cxx
index 59a933e9b47b4a85134b0e6d0b26bc59ccf402dd..6de22ddb9e5babedeb52ed603d00226d99d50512 100644 (file)
--- a/STEER/AliMagFMaps.cxx
+++ b/STEER/AliMagFMaps.cxx
@@ -175,7 +175,7 @@ Float_t AliMagFMaps::SolenoidField() const
 }
 
 //_______________________________________________________________________
-void AliMagFMaps::Field(Float_t *x, Float_t *b)
+void AliMagFMaps::Field(Float_t *x, Float_t *b) const
 {
   //
   // Method to calculate the magnetic field
@@ -184,7 +184,7 @@ void AliMagFMaps::Field(Float_t *x, Float_t *b)
   
 
     
-    if (!fFieldRead) ReadField();
+ //    if (!fFieldRead) ReadField();
 
   //
   // Field Maps have been calculated for the coordinate system in which 

diff --git a/STEER/AliMagFMaps.h b/STEER/AliMagFMaps.h
index 5546c0cfe9910cbab70f566534a20ca6bf9a4a20..da3a89c1df4839ab8cb46c4d06b73aa02ab3f343 100644 (file)
--- a/STEER/AliMagFMaps.h
+++ b/STEER/AliMagFMaps.h
@@ -26,7 +26,7 @@ public:
                Int_t l3 = 1);
     AliMagFMaps(const AliMagFMaps &mag);
     virtual ~AliMagFMaps();
-    virtual void    Field(Float_t *x, Float_t *b);
+    virtual void    Field(Float_t *x, Float_t *b) const;
     AliFieldMap* FieldMap(Int_t i) {return fFieldMap[i];}
     virtual void ReadField();
     virtual Float_t SolenoidField() const;