more text

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

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 834c24b59f2d9047ab32c67c67eb75b535fdb79c..1f714a3b8a71956d0c3124f1a15b2a717a6ee059 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -24,19 +24,19 @@ class AliMagF : public TVirtualMagField
   enum             {kOverrideGRP=BIT(14)}; // don't recreate from GRP if set
   //
   AliMagF();
-  AliMagF(const char *name, const char* title, Int_t integ, 
-         Double_t factorSol=1., Double_t factorDip=1., 
-         Double_t fmax=15, BMap_t maptype = k5kG,
-         const char* path="$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root",
-         BeamType_t btype=kBeamTypepp, Double_t benergy=7000.);
+  AliMagF(const char *name, const char* title,Double_t factorSol=1., Double_t factorDip=1., 
+         BMap_t maptype = k5kG, BeamType_t btype=kBeamTypepp, Double_t benergy=-1,     
+         Int_t integ=2, Double_t fmax=15,const char* path="$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root");
   AliMagF(const AliMagF& src);             
   AliMagF& operator=(const AliMagF& src);
   virtual ~AliMagF();
   //
   virtual void Field(const Double_t *x, Double_t *b);
-  void       GetTPCInt(const Double_t *xyz, Double_t *b)        const;
-  void       GetTPCIntCyl(const Double_t *rphiz, Double_t *b)   const;
-  Double_t   GetBz(const Double_t *xyz)                         const;
+  void       GetTPCInt(const Double_t *xyz, Double_t *b)         const;
+  void       GetTPCRatInt(const Double_t *xyz, Double_t *b)      const;
+  void       GetTPCIntCyl(const Double_t *rphiz, Double_t *b)    const;
+  void       GetTPCRatIntCyl(const Double_t *rphiz, Double_t *b) const;
+  Double_t   GetBz(const Double_t *xyz)                          const;
   //
   AliMagWrapCheb* GetMeasuredMap()                              const {return fMeasuredMap;}
   //
@@ -64,12 +64,13 @@ class AliMagF : public TVirtualMagField
   Char_t*      GetParamName()                                   const {return (Char_t*)fParNames.GetTitle();}
   void         SetDataFileName(const Char_t* nm)                      {fParNames.SetName(nm);}
   void         SetParamName(const Char_t* nm)                         {fParNames.SetTitle(nm);}
+  virtual void Print(Option_t *opt)                             const;
   //
   Bool_t       LoadParameterization();
   static Int_t GetPolarityConvention()                                {return Int_t(fgkPolarityConvention);}
   static AliMagF* CreateFieldMap(Float_t l3Current=-30000., Float_t diCurrent=-6000., 
                                 Int_t convention=0, Bool_t uniform = kFALSE, 
-                                Float_t benergy=7000., const Char_t* btype="pp",
+                                Float_t beamenergy=7000, const Char_t* btype="pp",
                                 const Char_t* path="$(ALICE_ROOT)/data/maps/mfchebKGI_sym.root");
   //
  protected: