--- PamVMC/include/PamVMCFieldMgr.h 2009/06/12 18:39:18 1.5 +++ PamVMC/include/PamVMCFieldMgr.h 2010/09/15 07:05:42 1.6 @@ -13,10 +13,9 @@ #define ZSPEBP 2.97 //cm #define HORMG 22.57 //cm -#ifdef PAMFIELD +//#ifdef PAMFIELD #include "TrkParams.h" -#endif - +//#endif #if ROOT_VERSION_CODE >= 333572 #include @@ -75,20 +74,20 @@ void Field(const Float_t* x, Float_t* b) { -#ifdef PAMFIELD - float xm[3]={x[0],x[1],x[2]-ZCAL-CALS3-ZSPEBP-HORMG}; - - b[0] = TrkParams::GetBX((float *)xm)*10; - b[1] = TrkParams::GetBY((float *)xm)*10; - b[2] = TrkParams::GetBZ((float *)xm)*10; - -#else - if(x) { - for (Int_t i=0; i<3; i++) b[i] = 0.0; - } else { - b[0]=b[1]=b[2]=0.0; - } -#endif +#ifdef PAMFIELD + float xm[3]={x[0],x[1],x[2]-ZCAL-CALS3-ZSPEBP-HORMG}; + + b[0] = TrkParams::GetBX((float *)xm)*10; + b[1] = TrkParams::GetBY((float *)xm)*10; + b[2] = TrkParams::GetBZ((float *)xm)*10; + +#else + if(x) { + for (Int_t i=0; i<3; i++) b[i] = 0.0; + } else { + b[0]=b[1]=b[2]=0.0; + } +#endif }