added the HCAL section and removed obsolete method

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

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 15b7001671a0c455a039201acc70499047757ac7..adf9637ea4072a39119374eae83cc1bfc032ebde 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -6,24 +6,27 @@
 /* $Id$ */
 
 #include "TNamed.h"
-#include "TVector.h"
 
 enum Field_t {kUndef=1, kConst=1, kConMesh=2, kDipoMap=3};
 
 class AliMagF : public TNamed {
 
 public:
-  AliMagF(){}
-  AliMagF(const char *name, const char *title, const Int_t integ, const Int_t map, 
-         const Float_t factor, const Float_t fmax);
+  AliMagF();
+  AliMagF(const char *name, const char *title, const Int_t integ, 
+         const Float_t factor = 1., const Float_t fmax = 10.);
   virtual ~AliMagF() {}
   virtual void Field(Float_t *x, Float_t *b);
-  virtual Int_t Type() {return fType;}
+  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 Float_t Factor() const {return fFactor;}
   virtual void ReadField() {}
+  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
@@ -31,31 +34,34 @@ protected:
   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
 };
 
 //ZDC part -------------------------------------------------------------------
 
-  static const Float_t kG1=20.03;
-  static const Float_t kFDIP=-37.34;
-  static const Float_t kFDIMU=6.;
-  static const Float_t kFCORN=11.72;
+static const Float_t kG1=20.443;
+static const Float_t kFDIP=-37.96;
+static const Float_t kFCORN2=-9.14;
 //
 // ZBEG       Beginning of the inner triplet
 // D1BEG      Beginning of separator dipole 1
 // D2BEG      Beginning of separator dipole 2
 // CORBEG     Corrector dipole beginning (because of dimuon arm)
 //
-  static const Float_t kCORBEG=1920,kCOREND=kCORBEG+190, kCORRA2=4.5*4.5;
+static const Float_t kCORBEG2=19216.,kCOREND2=kCORBEG2+170., kCOR2RA2=4.5*4.5;
+//
+static const Float_t kZBEG=2300.;
+static const Float_t kZ1BEG=kZBEG+   0.,kZ1END=kZ1BEG+630.,kZ1RA2=3.5*3.5;
+static const Float_t kZ2BEG=kZBEG+ 880.,kZ2END=kZ2BEG+550.,kZ2RA2=3.5*3.5;
+static const Float_t kZ3BEG=kZBEG+1530.,kZ3END=kZ3BEG+550.,kZ3RA2=3.5*3.5;
+static const Float_t kZ4BEG=kZBEG+2430.,kZ4END=kZ4BEG+630.,kZ4RA2=3.5*3.5;
+static const Float_t kD1BEG=5838.3    ,kD1END=kD1BEG+945.,kD1RA2=4.5*4.5;
+static const Float_t kD2BEG=12147.6   ,kD2END=kD2BEG+945.,kD2RA2=4.5*4.5;
 //
-  static const Float_t kZBEG=2300;
-  static const Float_t kZ1BEG=kZBEG+   0,kZ1END=kZ1BEG+630,kZ1RA2=3.5*3.5;
-  static const Float_t kZ2BEG=kZBEG+ 880,kZ2END=kZ2BEG+550,kZ2RA2=3.5*3.5;
-  static const Float_t kZ3BEG=kZBEG+1530,kZ3END=kZ3BEG+550,kZ3RA2=3.5*3.5;
-  static const Float_t kZ4BEG=kZBEG+2430,kZ4END=kZ4BEG+630,kZ4RA2=3.5*3.5;
-  static const Float_t kD1BEG=5843.5    ,kD1END=kD1BEG+945,kD1RA2=4.5*4.5;
-  static const Float_t kD2BEG=12113.2   ,kD2END=kD2BEG+945,kD2RA2=4.5*.5;
+static const Float_t kXCEN1D2=-9.7    ,kYCEN1D2=0.;
+static const Float_t kXCEN2D2=9.7     ,kYCEN2D2=0.;
 
 //ZDC part -------------------------------------------------------------------