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 b03e5844d23948ebc45194ce4a636ec2b62ce456..7ec67c48a0ce6e9d1b17f428ee42b97637c3d42d 100644 (file)
--- a/STEER/AliMagF.cxx
+++ b/STEER/AliMagF.cxx
@@ -13,60 +13,63 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.5  2000/06/09 19:55:18  morsch
-Introduce new class AliMagFDM - Galina Chabratova
-
-
-Revision 1.4  2000/03/28 12:40:24  fca
-Introduce factor for magnetic field
-
-
-Revision 1.3  1999/09/29 09:24:29  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
+//----------------------------------------------------------------------
+// Basic magnetic field class
+// Used in all the detectors, and also in the traking classes
+// Author:
+//----------------------------------------------------------------------
 
+#include "AliLog.h"
 #include "AliMagF.h"
-#include "TSystem.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-
+Bool_t AliMagF::fgReadField = kTRUE;
 ClassImp(AliMagF)
 
-//________________________________________
-AliMagF::AliMagF(const char *name, const char *title, const Int_t integ, 
-                const Int_t map, const Float_t factor, const Float_t fmax)
-  : TNamed(name,title)
+//_______________________________________________________________________
+AliMagF::AliMagF():
+  fMap(0),
+  fType(0),
+  fInteg(0),
+  fFactor(0),
+  fMax(0)
+{
+  //
+  // Default constructor
+  //
+}
+
+//_______________________________________________________________________
+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)
 {
   //
   // Standard constructor
   //
-  fMap = map;
-  fType = kUndef;
-  fInteg = integ;
-  fFactor = factor;
-  fMax = fmax;
+    if(integ<0 || integ > 2) {
+      AliWarning(Form(
+              "Invalid magnetic field flag: %5d; Helix tracking chosen instead"
+              ,integ));
+      fInteg = 2;
+    } else {
+      fInteg = integ;
+    }
+    fType = kUndef;
+    //
 }
 
-//________________________________________
-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
   //
-  printf("Undefined MagF Field called, returning 0\n");
+  AliWarning("Undefined MagF Field called, returning 0");
   b[0]=b[1]=b[2]=0;
 }
-      
-
-
-  
-
-
-
-