Pedestal suppression implemented

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

diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h
index 99395f5f6c94c9ae1a9cd8f2c44572dcfb5db4db..31a5068a3fa25aef2360bcd2a55abd1323b03045 100644 (file)
--- a/STEER/AliMagFCM.h
+++ b/STEER/AliMagFCM.h
@@ -5,49 +5,62 @@
 
 /* $Id$ */
 
-#include "AliMagF.h"
-#include "TVector.h"
+//-----------------------------------------------------------------------
+//  Class for Alice magnetic field with constant mesh
+//  Used in the configuration macros (macros/Config.C, etc.)
+//  Author:
+//-----------------------------------------------------------------------
 
-class AliMagFCM : public AliMagF
+#include "AliMagFC.h"
+#include <TVector.h>
+
+class AliMagFCM : public AliMagFC
 {
-  //Alice Magnetic Field with constan mesh
+  //Alice Magnetic Field with constant mesh
 
 public:
-  AliMagFCM(){}
-  AliMagFCM(const char *name, const char *title, const Int_t integ, const Int_t map, 
-          const Float_t factor, const Float_t fmax);
+  AliMagFCM();
+  AliMagFCM(const char *name, const char *title, Int_t integ,
+          Float_t factor, Float_t fmax);
   AliMagFCM(const AliMagFCM &mag);
   virtual ~AliMagFCM() {delete fB;}
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual void ReadField();
-  void Copy(AliMagFCM &magf) const;
-  virtual AliMagFCM & operator=(const AliMagFCM &magf);
+  virtual void    SetSolenoidField(Float_t field = 2.) {fSolenoid = field;}
+  virtual Float_t SolenoidField() const {
+    return -Factor()*fSolenoid;
+  }
+  
+  void Copy(TObject &magf) const;
+  virtual AliMagFCM & operator=(const AliMagFCM &magf)
+    {magf.Copy(*this); return *this;}
 
-  Float_t Bx(const Int_t ix, const Int_t iy, const Int_t iz) {
+  Float_t Bx(Int_t ix, Int_t iy, Int_t iz) const {
     return (*fB)(3*(iz*(fXn*fYn)+iy*fXn+ix));
   }
-  Float_t By(const Int_t ix, const Int_t iy, const Int_t iz) {
+  Float_t By(Int_t ix, Int_t iy, Int_t iz) const {
     return (*fB)(3*(iz*(fXn*fYn)+iy*fXn+ix)+1);
   }
-  Float_t Bz(const Int_t ix, const Int_t iy, const Int_t iz) {
+  Float_t Bz(Int_t ix, Int_t iy, Int_t iz) const {
     return (*fB)(3*(iz*(fXn*fYn)+iy*fXn+ix)+2);
   }
 
 protected:
 
-  Float_t    fXbeg;  // Start of mesh in x
-  Float_t    fYbeg;  // Start of mesh in y
-  Float_t    fZbeg;  // Start of mesh in z
-  Float_t    fXdel;  // Mesh step in x
-  Float_t    fYdel;  // Mesh step in y
-  Float_t    fZdel;  // Mesh step in z
-  Double_t   fXdeli; // Inverse of Mesh step in x
-  Double_t   fYdeli; // Inverse of Mesh step in y
-  Double_t   fZdeli; // Inverse of Mesh step in z
-  Int_t      fXn;    // Number of mesh points in x
-  Int_t      fYn;    // Number of mesh points in y
-  Int_t      fZn;    // Number of mesh points in z
-  TVector   *fB;     // Field map
+  Float_t    fXbeg;     // Start of mesh in x
+  Float_t    fYbeg;     // Start of mesh in y
+  Float_t    fZbeg;     // Start of mesh in z
+  Float_t    fXdel;     // Mesh step in x
+  Float_t    fYdel;     // Mesh step in y
+  Float_t    fZdel;     // Mesh step in z
+  Float_t    fSolenoid; // Solenoid Field Strength
+  Double_t   fXdeli;    // Inverse of Mesh step in x
+  Double_t   fYdeli;    // Inverse of Mesh step in y
+  Double_t   fZdeli;    // Inverse of Mesh step in z
+  Int_t      fXn;       // Number of mesh points in x
+  Int_t      fYn;       // Number of mesh points in y
+  Int_t      fZn;       // Number of mesh points in z
+  TVector   *fB;        // Field map
   
   ClassDef(AliMagFCM,1)  //Class for all Alice MagField with Constant Mesh
 };