Updates for full map (R. Shahoyan)

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

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 7a4f2564541562024c19079feaffe92336af413f..d9e3250fce807ddf7c4e0710d99093c9d9942785 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -21,27 +21,31 @@ public:
   AliMagF();
   AliMagF(const char *name, const char *title, Int_t integ, 
          Float_t factor = 1., Float_t fmax = 10.);
+  AliMagF(const AliMagF& maps);
   virtual ~AliMagF() {}
-  virtual void Field(Float_t *x, Float_t *b) const;
-  virtual Int_t Type() const {return fType;}
+  AliMagF& operator=(const AliMagF& rhs);
+  virtual void    Field(Float_t *x, Float_t *b) const;
+  virtual void    GetTPCInt(Float_t *xyz, Float_t *b)        const;
+  virtual void    GetTPCIntCyl(Float_t *rphiz, 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;}
-  virtual Int_t Integ() const {return fInteg;}
+  virtual Int_t   Map() const {return fMap;}
+  virtual Int_t   Integ() const {return fInteg;}
+  virtual Int_t   PrecInteg() const {return fPrecInteg;}  
   virtual Float_t Factor() const {return fFactor;}
-  virtual void ReadField() {}
-  virtual void SetDebug(Int_t level=0) {fDebug=level;}
+  virtual void    ReadField() {}
   virtual Float_t SolenoidField() const {return 2.;}
-  virtual Int_t GetDebug() const {return fDebug;}
-  static void  SetReadField(Bool_t flag = kTRUE) {fgReadField = flag;}
+  virtual void    SetPrecInteg(Int_t integ) {fPrecInteg = integ;}
+  virtual void    SetReadField(Bool_t flag = kTRUE) {fReadField = flag;}
  protected:
   Int_t     fMap;       // Field Map identifier
   Int_t     fType;      // Mag Field type
-  Int_t     fInteg;     // Integration method as indicated in Geant
+  Int_t     fInteg;     // Default integration method as indicated in Geant
+  Int_t     fPrecInteg; // Alternative integration method, e.g. for higher precision
   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
+  Bool_t    fReadField; // Flag for reading the field from file (if available) 
+  ClassDef(AliMagF,5)   //Base class for all Alice MagField
 };
 
 #endif