Corrector dipole removed from ZDC

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index 30f4c81edde6f6d441b92f4eb4385774ca3b58d7..b8c0333973f758e7ae6c02e42c0e9d05ab9e1f1d 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -39,7 +39,6 @@ protected:
   static const Float_t kG1=20.03;
   static const Float_t kFDIP=-37.34;
   static const Float_t kFDIMU=6.;
-  static const Float_t kFCORN1=9.4;
   static const Float_t kFCORN2=-9.4;
 //
 // ZBEG       Beginning of the inner triplet
@@ -47,7 +46,6 @@ protected:
 // D2BEG      Beginning of separator dipole 2
 // CORBEG     Corrector dipole beginning (because of dimuon arm)
 //
-  static const Float_t kCORBEG1=805,kCOREND1=kCORBEG1+340, kCOR1RA2=4.5*4.5;
   static const Float_t kCORBEG2=19216,kCOREND2=kCORBEG2+170, kCOR2RA2=4.5*4.5;
 //
   static const Float_t kZBEG=2300;

diff --git a/STEER/AliMagFC.cxx b/STEER/AliMagFC.cxx
index f708df6f4a6b847a661f3f7ba65bdea61b31cc27..c2fff18dfcfb21dc2eb42e79a97873909e5393a1 100644 (file)
--- a/STEER/AliMagFC.cxx
+++ b/STEER/AliMagFC.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2000/11/10 18:09:55  fca
+New field map for the ZDC
+
 Revision 1.2  2000/07/12 08:56:25  fca
 Coding convention correction and warning removal
 
@@ -59,12 +62,7 @@ void AliMagFC::Field(Float_t *x, Float_t *b)
       else {
 //This is the ZDC part
     Float_t rad2=x[0]*x[0]+x[1]*x[1];
-    if(x[2]>kCORBEG1 && x[2]<kCOREND1){
-      if(rad2<kCOR1RA2){
-        b[0] = kFCORN1;
-      }
-    }
-    else if(x[2]>kCORBEG2 && x[2]<kCOREND2){
+    if(x[2]>kCORBEG2 && x[2]<kCOREND2){
       if(rad2<kCOR2RA2){
         b[0] = kFCORN2;
       }

diff --git a/STEER/AliMagFCM.cxx b/STEER/AliMagFCM.cxx
index 4953030f0503a09f107264da2cf9e905da13048b..9d354bfe69e18a101d5d266832fa18a146270e7f 100644 (file)
--- a/STEER/AliMagFCM.cxx
+++ b/STEER/AliMagFCM.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.4  2000/11/30 07:12:49  alibrary
+Introducing new Rndm and QA classes
+
 Revision 1.3  2000/11/10 18:09:55  fca
 New field map for the ZDC
 
@@ -133,12 +136,7 @@ void AliMagFCM::Field(Float_t *x, Float_t *b)
     } else {
 //This is the ZDC part
     Float_t rad2=x[0]*x[0]+x[1]*x[1];
-    if(x[2]>kCORBEG1 && x[2]<kCOREND1){
-      if(rad2<kCOR1RA2){
-        b[0] = kFCORN1;
-      }
-    }
-    else if(x[2]>kCORBEG2 && x[2]<kCOREND2){
+    if(x[2]>kCORBEG2 && x[2]<kCOREND2){
       if(rad2<kCOR2RA2){
         b[0] = kFCORN2;
       }

diff --git a/STEER/AliMagFDM.cxx b/STEER/AliMagFDM.cxx
index c19c2030079743d7b1ea66fc69361f8ec0aee840..312a7d122e747721dc3595196388c84ff2354881 100644 (file)
--- a/STEER/AliMagFDM.cxx
+++ b/STEER/AliMagFDM.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.6  2000/11/10 18:09:55  fca
+New field map for the ZDC
+
 Revision 1.5  2000/10/27 14:17:04  morsch
 - Bug causing segmentation violation during muon reconstruction corrected
 - Coding rule violations corrected.
@@ -274,12 +277,7 @@ if ((kfZbg/100<xL3[2] && xL3[2]<=zCmin && r0<=rPmax) || ((zCmin<xL3[2] && xL3[2]
 
 //This is the ZDC part
     Float_t rad2=x[0]*x[0]+x[1]*x[1];
-    if(x[2]>kCORBEG1 && x[2]<kCOREND1){
-      if(rad2<kCOR1RA2){
-        b[0] = kFCORN1;
-      }
-    }
-    else if(x[2]>kCORBEG2 && x[2]<kCOREND2){
+    if(x[2]>kCORBEG2 && x[2]<kCOREND2){
       if(rad2<kCOR2RA2){
         b[0] = kFCORN2;
       }