Correct overloading of virtual functions in the derived classes (icc)

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

diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx
index 5ff82e6e412cc6fedb5a7973425fa9618e2ef087..7ec67c48a0ce6e9d1b17f428ee42b97637c3d42d 100644 (file)
--- a/STEER/AliMagF.cxx
+++ b/STEER/AliMagF.cxx
@@ -15,12 +15,15 @@
 
 /* $Id$ */
 
-//
+//----------------------------------------------------------------------
 // Basic magnetic field class
-//
+// Used in all the detectors, and also in the traking classes
+// Author:
+//----------------------------------------------------------------------
 
+#include "AliLog.h"
 #include "AliMagF.h"
-
+Bool_t AliMagF::fgReadField = kTRUE;
 ClassImp(AliMagF)
 
 //_______________________________________________________________________
@@ -29,8 +32,7 @@ AliMagF::AliMagF():
   fType(0),
   fInteg(0),
   fFactor(0),
-  fMax(0),
-  fDebug(0)
+  fMax(0)
 {
   //
   // Default constructor
@@ -38,38 +40,36 @@ AliMagF::AliMagF():
 }
 
 //_______________________________________________________________________
-AliMagF::AliMagF(const char *name, const char *title, const Int_t integ, 
-                 const Float_t factor, const Float_t fmax):
+AliMagF::AliMagF(const char *name, const char *title, Int_t integ, 
+                 Float_t factor, Float_t fmax):
   TNamed(name,title),
   fMap(0),
   fType(0),
   fInteg(0),
   fFactor(factor),
-  fMax(fmax),
-  fDebug(0)
+  fMax(fmax)
 {
   //
   // Standard constructor
   //
     if(integ<0 || integ > 2) {
-      Warning("SetField",
-              "Invalid magnetic field flag: %5d; Helix tracking chosen instead\n"
-              ,integ);
+      AliWarning(Form(
+              "Invalid magnetic field flag: %5d; Helix tracking chosen instead"
+              ,integ));
       fInteg = 2;
     } else {
       fInteg = integ;
     }
     fType = kUndef;
     //
-    fDebug = 0;
 }
 
 //_______________________________________________________________________
-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
   //
-  Warning("Field","Undefined MagF Field called, returning 0\n");
+  AliWarning("Undefined MagF Field called, returning 0");
   b[0]=b[1]=b[2]=0;
 }