From 5de97576766564cac2cdb63e47c9bde42d3a20c6 Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Sat, 13 Sep 2008 08:39:44 +0000
Subject: [PATCH] Derive from MagFC to include the LHC field.

---
 STEER/AliCheb3DCalc.h    |  2 +-
 STEER/AliMagWrapCheb.cxx | 13 +++++++++----
 STEER/AliMagWrapCheb.h   |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/STEER/AliCheb3DCalc.h b/STEER/AliCheb3DCalc.h
index 0809743aaa4..65c427ada4f 100644
--- a/STEER/AliCheb3DCalc.h
+++ b/STEER/AliCheb3DCalc.h
@@ -17,7 +17,7 @@
 
 // when _BRING_TO_BOUNDARY_ is defined, the point outside of the fitted folume is assumed
 // to be on the surface 
-#define _BRING_TO_BOUNDARY_
+// #define _BRING_TO_BOUNDARY_
 //
 
 
diff --git a/STEER/AliMagWrapCheb.cxx b/STEER/AliMagWrapCheb.cxx
index 412dbd13730..67659c19390 100644
--- a/STEER/AliMagWrapCheb.cxx
+++ b/STEER/AliMagWrapCheb.cxx
@@ -26,7 +26,7 @@ ClassImp(AliMagWrapCheb)
 
 //_______________________________________________________________________
 AliMagWrapCheb::AliMagWrapCheb():
-  AliMagF(),
+  AliMagFC(),
   fMeasuredMap(0),
   fSolenoid(5.)
 {
@@ -38,7 +38,7 @@ AliMagWrapCheb::AliMagWrapCheb():
 AliMagWrapCheb::AliMagWrapCheb(const char *name, const char *title, Int_t integ, 
 			       Float_t factor, Float_t fmax, Int_t map, 
 			       Bool_t dipoleON,const char* path):
-  AliMagF(name, title, integ, factor, fmax),
+  AliMagFC(name, title, integ, factor, fmax),
   fMeasuredMap(0),
   fSolenoid(5.)
 {
@@ -74,7 +74,7 @@ AliMagWrapCheb::AliMagWrapCheb(const char *name, const char *title, Int_t integ,
 
 //_______________________________________________________________________
 AliMagWrapCheb::AliMagWrapCheb(const AliMagWrapCheb &src):
-  AliMagF(src),
+  AliMagFC(src),
   fMeasuredMap(0),
   fSolenoid(src.fSolenoid)
 {
@@ -110,7 +110,12 @@ void AliMagWrapCheb::Field(Float_t *xyz, Float_t *b) const
 {
   // Method to calculate the field at point  xyz
   //
-  if (fMeasuredMap) fMeasuredMap->Field(xyz,b);
+    if (xyz[2] > 919. || xyz[2] < -1972.) {
+	ZDCField(xyz, b);
+    } else {
+	if (fMeasuredMap) fMeasuredMap->Field(xyz,b);
+    }
+    
   for (int i=3;i--;) b[i] *= fFactor;
 }
 
diff --git a/STEER/AliMagWrapCheb.h b/STEER/AliMagWrapCheb.h
index 00570fb6830..7959c3ea688 100644
--- a/STEER/AliMagWrapCheb.h
+++ b/STEER/AliMagWrapCheb.h
@@ -9,11 +9,11 @@
 // Author: ruben.shahoyan@cern.ch
 //
 
-#include "AliMagF.h"
+#include "AliMagFC.h"
 #include "AliMagFCheb.h"
 
 
-class AliMagWrapCheb : public AliMagF
+class AliMagWrapCheb : public AliMagFC
 {
 public:
   enum constants {k2kG, k4kG, k5kG};
-- 
2.43.0