Some of the coding violations corrected

[u/mrichter/AliRoot.git] / TPC / AliTPCExBExact.cxx

diff --git a/TPC/AliTPCExBExact.cxx b/TPC/AliTPCExBExact.cxx
index 8756c204561cc65077eea47038278477f48306dd..2991ae0ce11e10b53ad78511537d2d698f254863 100644 (file)
--- a/TPC/AliTPCExBExact.cxx
+++ b/TPC/AliTPCExBExact.cxx
@@ -23,18 +23,18 @@
 
 #include "TMath.h"
 #include "TTreeStream.h"
-#include "AliFieldMap.h"
 #include "AliMagF.h"
 #include "AliTPCExBExact.h"
 
 ClassImp(AliTPCExBExact)
 
 const Double_t AliTPCExBExact::fgkEM=1.602176487e-19/9.10938215e-31;
-const Double_t AliTPCExBExact::fgkDriftField=40.e3;
+const Double_t AliTPCExBExact::fgkDriftField=-40.e3;
 
 AliTPCExBExact::AliTPCExBExact()
   : fDriftVelocity(0),
-    fkMap(0),fkField(0),fkN(0),
+    //fkMap(0),
+    fkField(0),fkN(0),
     fkNX(0),fkNY(0),fkNZ(0),
     fkXMin(-250.),fkXMax(250.),fkYMin(-250.),fkYMax(250.),
     fkZMin(-250.),fkZMax(250.),
@@ -48,7 +48,8 @@ AliTPCExBExact::AliTPCExBExact(const AliMagF *bField,
                               Double_t driftVelocity,
                               Int_t nx,Int_t ny,Int_t nz,Int_t n)
   : fDriftVelocity(driftVelocity),
-    fkMap(0),fkField(bField),fkN(n),
+    //fkMap(0),
+    fkField(bField),fkN(n),
     fkNX(nx),fkNY(ny),fkNZ(nz),
     fkXMin(-250.),fkXMax(250.),fkYMin(-250.),fkYMax(250.),
     fkZMin(-250.),fkZMax(250.),
@@ -63,6 +64,7 @@ AliTPCExBExact::AliTPCExBExact(const AliMagF *bField,
   CreateLookupTable();
 }
 
+/*
 AliTPCExBExact::AliTPCExBExact(const AliFieldMap *bFieldMap,
                               Double_t driftVelocity,Int_t n) 
   : fDriftVelocity(driftVelocity),
@@ -101,6 +103,7 @@ AliTPCExBExact::AliTPCExBExact(const AliFieldMap *bFieldMap,
 
   CreateLookupTable();
 }
+*/
 
 AliTPCExBExact::~AliTPCExBExact() {
   //
@@ -155,6 +158,7 @@ void AliTPCExBExact::Correct(const Double_t *position, Double_t *corrected) {
   //    corrected[2]=position[2];
 }
 
+/*
 void AliTPCExBExact::TestThisBeautifulObject(const AliFieldMap *bFieldMap,
                                             const char* fileName) {
   //
@@ -164,6 +168,7 @@ void AliTPCExBExact::TestThisBeautifulObject(const AliFieldMap *bFieldMap,
   fkField=0;
   TestThisBeautifulObjectGeneric(fileName);
 }
+*/
 
 void AliTPCExBExact::TestThisBeautifulObject(const AliMagF *bField,
                                             const char* fileName) {
@@ -171,7 +176,7 @@ void AliTPCExBExact::TestThisBeautifulObject(const AliMagF *bField,
   // Have a look at the common part "TestThisBeautifulObjectGeneric".
   //
   fkField=bField;
-  fkMap=0;
+  //fkMap=0;
   TestThisBeautifulObjectGeneric(fileName);
 }
 
@@ -203,7 +208,12 @@ void AliTPCExBExact::TestThisBeautifulObjectGeneric(const char* fileName) {
        Double_t dnlx=x[0]-dnl[0];
        Double_t dnly=x[1]-dnl[1];
        Double_t dnlz=x[2]-dnl[2];
+       Double_t b[3];
+       GetB(b,x);
        ts<<"positions"
+         <<"bx="<<b[0]
+         <<"by="<<b[1]
+         <<"bz="<<b[2]
          <<"x0="<<x[0]
          <<"x1="<<x[1]
          <<"x2="<<x[2]
@@ -256,15 +266,15 @@ void AliTPCExBExact::GetB(Double_t *b,const Double_t *x) const {
   //
   // Helper function returning the B field in SI units (T).
   //
-  Float_t xm[3];
+  Double_t xm[3];
   // the beautiful m to cm (and the ugly "const_cast") and Double_t 
   // to Float_t read the NRs introduction!:
   for (int i=0;i<3;++i) xm[i]=x[i]*100.;
-  Float_t bf[3];
-  if (fkMap!=0)
-    fkMap->Field(xm,bf);
-  else
-    fkField->Field(xm,bf);
+  Double_t bf[3];
+  //if (fkMap!=0)
+  //  fkMap->Field(xm,bf);
+  //else
+  ((AliMagF*)fkField)->Field(xm,bf);
   for (int i=0;i<3;++i) b[i]=bf[i]/10.;
 }