Remove unused functions GetNextXXXX

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

diff --git a/STEER/AliMagFCM.cxx b/STEER/AliMagFCM.cxx
index d145de1bbbb00df2757d7a7c6ece0b19acb5b88c..33ea712b9370d46edf7a262d9ea2d996e9a420bd 100644 (file)
--- a/STEER/AliMagFCM.cxx
+++ b/STEER/AliMagFCM.cxx
@@ -15,6 +15,27 @@
 
 /*
 $Log$
+Revision 1.8  2001/05/28 14:10:35  morsch
+SetSolenoidField method to set the L3 field strength. 2 kG is default.
+
+Revision 1.7  2001/05/16 14:57:22  alibrary
+New files for folders and Stack
+
+Revision 1.6  2000/12/18 10:44:01  morsch
+Possibility to set field map by passing pointer to objet of type AliMagF via
+SetField().
+Example:
+gAlice->SetField(new AliMagFCM("Map2", "$(ALICE_ROOT)/data/field01.dat",2,1.,10.));
+
+Revision 1.5  2000/12/01 11:20:27  alibrary
+Corrector dipole removed from ZDC
+
+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
+
 Revision 1.2  2000/07/12 08:56:25  fca
 Coding convention correction and warning removal
 
@@ -22,6 +43,7 @@ Revision 1.1  2000/07/11 18:24:59  fca
 Coding convention corrections + few minor bug fixes
 
 */
+#include "TVector.h"
 
 #include "AliMagFCM.h"
 #include "TSystem.h"
@@ -30,15 +52,20 @@ ClassImp(AliMagFCM)
 
 //________________________________________
 AliMagFCM::AliMagFCM(const char *name, const char *title, const Int_t integ, 
-                    const Int_t map, const Float_t factor, const Float_t fmax)
-  : AliMagF(name,title,integ,map,factor,fmax)
+                    const Float_t factor, const Float_t fmax)
+  : AliMagF(name,title,integ,factor,fmax)
 {
   //
   // Standard constructor
   //
+  fB=0;
   fType = kConMesh;
-  printf("Constant Mesh Field %s created: map= %d, factor= %f, file= %s\n",
-        fName.Data(),map,factor,fTitle.Data());
+  fMap  = 2;
+  SetSolenoidField();
+
+  if(fDebug>-1) printf("%s: Constant Mesh Field %s created: map= %d, factor= %f, file= %s\n",
+        ClassName(),fName.Data(), fMap, factor,fTitle.Data());
+  
 }
 
 //________________________________________
@@ -65,7 +92,7 @@ void AliMagFCM::Field(Float_t *x, Float_t *b)
   
   b[0]=b[1]=b[2]=0;
   if(-700<x[2] && x[2]<fZbeg && x[0]*x[0]+(x[1]+30)*(x[1]+30) < 560*560) {
-    b[2]=2;
+    b[2]= fSolenoid;
   } else  {
     Bool_t infield=(fZbeg<=x[2] && x[2]<fZbeg+fZdel*(fZn-1)
                    &&  ( fXbeg <= TMath::Abs(x[0]) && TMath::Abs(x[0]) < fXbeg+fXdel*(fXn-1) )
@@ -129,12 +156,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;
       }
@@ -194,15 +216,15 @@ void AliMagFCM::ReadField()
   Int_t ix, iy, iz, ipx, ipy, ipz;
   Float_t bx, by, bz;
   char *fname;
-  printf("Reading Magnetic Field %s from file %s\n",fName.Data(),fTitle.Data());
+  if(fDebug) printf("%s: Reading Magnetic Field %s from file %s\n",ClassName(),fName.Data(),fTitle.Data());
   fname = gSystem->ExpandPathName(fTitle.Data());
   magfile=fopen(fname,"r");
   delete [] fname;
   if (magfile) {
     fscanf(magfile,"%d %d %d %f %f %f %f %f %f",
           &fXn, &fYn, &fZn, &fXdel, &fYdel, &fZdel, &fXbeg, &fYbeg, &fZbeg);
-    printf("fXn %d, fYn %d, fZn %d, fXdel %f, fYdel %f, fZdel %f, fXbeg %f, fYbeg %f, fZbeg %f\n",
-          fXn, fYn, fZn, fXdel, fYdel, fZdel, fXbeg, fYbeg, fZbeg);
+    if(fDebug>1) printf("%s: fXn %d, fYn %d, fZn %d, fXdel %f, fYdel %f, fZdel %f, fXbeg %f, fYbeg %f, fZbeg %f\n",
+                       ClassName(),fXn, fYn, fZn, fXdel, fYdel, fZdel, fXbeg, fYbeg, fZbeg);
     fXdeli=1./fXdel;
     fYdeli=1./fYdel;
     fZdeli=1./fZdel;
@@ -221,7 +243,7 @@ void AliMagFCM::ReadField()
       }
     }
   } else { 
-    printf("File %s not found !\n",fTitle.Data());
+    printf("%s: File %s not found !\n",ClassName(),fTitle.Data());
     exit(1);
   }
 }