Modifications associated with remerging the Ba/Sa and Dubna pixel simulations,

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

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 6bf3de6bc2fe68fe6717e116e50f2d36a61c69a4..7a4f2564541562024c19079feaffe92336af413f 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;}
@@ -32,16 +32,16 @@ public:
   virtual void SetDebug(Int_t level=0) {fDebug=level;}
   virtual Float_t SolenoidField() const {return 2.;}
   virtual Int_t GetDebug() const {return fDebug;}
-  
-protected:
-  Int_t     fMap;    // Field Map identifier
-  Int_t     fType;   // Mag Field type
-  Int_t     fInteg;  // Integration method as indicated in Geant
-  Float_t   fFactor; // Multiplicative factor
-  Float_t   fMax;    // Max Field as indicated in Geant
-  Int_t     fDebug;  // Debug flag
-
-  ClassDef(AliMagF,1)  //Base class for all Alice MagField
+  static void  SetReadField(Bool_t flag = kTRUE) {fgReadField = flag;}
+ protected:
+  Int_t     fMap;       // Field Map identifier
+  Int_t     fType;      // Mag Field type
+  Int_t     fInteg;     // Integration method as indicated in Geant
+  Float_t   fFactor;    // Multiplicative factor
+  Float_t   fMax;       // Max Field as indicated in Geant
+  Int_t     fDebug;     // Debug flag
+  static  Bool_t    fgReadField;  // Flag for reading the field from file (if available) 
+  ClassDef(AliMagF,2)  //Base class for all Alice MagField
 };
 
 #endif