Removing warnings (icc)

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

diff --git a/STEER/AliMagFCM.h b/STEER/AliMagFCM.h
index 08c1ad41cd0f6ab32afd723c9bd000cf308ae4ba..6985e4d8faf73fb5f4ca8661d87deb92a026d952 100644 (file)
--- a/STEER/AliMagFCM.h
+++ b/STEER/AliMagFCM.h
@@ -5,22 +5,27 @@
 
 /* $Id$ */
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
+class TVector;
 
-class AliMagFCM : public AliMagF
+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, 
+  AliMagFCM();
+  AliMagFCM(const char *name, const char *title, const Int_t integ,
           const Float_t factor, const Float_t fmax);
   AliMagFCM(const AliMagFCM &mag);
   virtual ~AliMagFCM() {delete fB;}
   virtual void Field(Float_t *x, Float_t *b);
   virtual void ReadField();
-  virtual 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 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) {
     return (*fB)(3*(iz*(fXn*fYn)+iy*fXn+ix));
@@ -34,19 +39,20 @@ public:
 
 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
 };