changed geometry call

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

diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx
index 8927ae66b8ac327b314b9956603357dfe12149fd..82ee3bb7239997fdc3765ce38855696af3d17bd1 100644 (file)
--- a/STEER/AliMagF.cxx
+++ b/STEER/AliMagF.cxx
@@ -13,79 +13,65 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.8  2000/12/18 10:44:01  morsch
-Possibility to set field map by passing pointer to objet of type AliMagF via
-SetField().
-Example:
-gAlice->SetField(new AliMagFCM("Map2", "$(ALICE_ROOT)/data/field01.dat",2,1.,10.));
-
-Revision 1.7  2000/10/02 21:28:14  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.6  2000/07/11 18:24:59  fca
-Coding convention corrections + few minor bug fixes
-
-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 "AliMagF.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-
-
 ClassImp(AliMagF)
 
-//________________________________________
-AliMagF::AliMagF(const char *name, const char *title, const Int_t integ, 
-                const Float_t factor, const Float_t fmax)
-  : TNamed(name,title)
+//_______________________________________________________________________
+AliMagF::AliMagF():
+  fMap(0),
+  fType(0),
+  fInteg(0),
+  fFactor(0),
+  fMax(0),
+  fDebug(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),
+  fDebug(0)
 {
   //
   // Standard constructor
   //
     if(integ<0 || integ > 2) {
-       Warning("SetField",
-               "Invalid magnetic field flag: %5d; Helix tracking chosen instead\n"
-               ,integ);
-       fInteg = 2;
+      Warning("SetField",
+              "Invalid magnetic field flag: %5d; Helix tracking chosen instead\n"
+              ,integ);
+      fInteg = 2;
     } else {
-       fInteg = integ;
+      fInteg = integ;
     }
     fType = kUndef;
-    fFactor = factor;
-    fMax = fmax;
     //
     fDebug = 0;
 }
 
-//________________________________________
+//_______________________________________________________________________
 void AliMagF::Field(Float_t*, Float_t *b)
 {
   //
   // Method to return the field in one point -- dummy in this case
   //
-  printf("Undefined MagF Field called, returning 0\n");
+  Warning("Field","Undefined MagF Field called, returning 0\n");
   b[0]=b[1]=b[2]=0;
 }
-      
-
-
-  
-
-
-
-