Changed return type of GetNCells (Gustavo)

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

diff --git a/STEER/AliMagFC.h b/STEER/AliMagFC.h
index 3d50bcea736ed49fd44fbf6e9fa77d812cbedf37..8635e3a7c758070157caf494b94f7c7777004891 100644 (file)
--- a/STEER/AliMagFC.h
+++ b/STEER/AliMagFC.h
@@ -18,22 +18,25 @@ class AliMagFC  : public AliMagF
   //Alice Constant Magnetic Field
 
 public:
-  AliMagFC(){}
+  AliMagFC():AliMagF(),fCompensator(kFALSE){}
   AliMagFC(const char *name, const char *title, Int_t integ, 
           Float_t factor, Float_t fmax);
-  virtual ~AliMagFC() {}
-  virtual void Field(Float_t *x, Float_t *b);
+  virtual ~AliMagFC(){}
+  virtual void Field(Float_t *x, Float_t *b) const;
   virtual void ReadField() {}
-  virtual void ZDCField(Float_t *x, Float_t *b);
-  ClassDef(AliMagFC,1)  //Class for all Alice Constant MagField 
+  virtual void ZDCField(Float_t *x, Float_t *b) const;
+  virtual void SetCompensatorMagnet(Bool_t flag) {fCompensator = flag;}
+ private:
+  Bool_t  fCompensator; // Flag for compensator magnetic field (kTrue -> ON)
+  ClassDef(AliMagFC,2)  //Class for all Alice Constant MagField 
 };
 
 
 //ZDC part -------------------------------------------------------------------
 
-// ************************ LHC optics v6.4 *****************************
-static const Float_t kG1=20.443;
-static const Float_t kFDIP=-37.85;
+// ************************ LHC optics v6.5 *****************************
+static const Float_t kG1=20.757;
+static const Float_t kFDIP=-37.866;
 static const Float_t kFCORN2=-9.6979; 
 //
 // ZBEG       Beginning of the inner triplet