/[PAMELA software]/PamVMC/include/PamVMCFieldMgr.h
ViewVC logotype

Diff of /PamVMC/include/PamVMCFieldMgr.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by pam-rm2, Fri Jun 12 18:39:18 2009 UTC revision 1.6 by pizzolot, Wed Sep 15 07:05:42 2010 UTC
# Line 13  Line 13 
13  #define ZSPEBP 2.97   //cm  #define ZSPEBP 2.97   //cm
14  #define HORMG  22.57  //cm  #define HORMG  22.57  //cm
15    
16  #ifdef PAMFIELD  //#ifdef PAMFIELD
17  #include "TrkParams.h"  #include "TrkParams.h"
18  #endif  //#endif
   
19    
20  #if ROOT_VERSION_CODE >= 333572  #if ROOT_VERSION_CODE >= 333572
21     #include <TVirtualMagField.h>     #include <TVirtualMagField.h>
# Line 75  Line 74 
74    void Field(const Float_t* x, Float_t* b) {    void Field(const Float_t* x, Float_t* b) {
75    
76    
77  #ifdef PAMFIELD  #ifdef PAMFIELD
78      float xm[3]={x[0],x[1],x[2]-ZCAL-CALS3-ZSPEBP-HORMG};        float xm[3]={x[0],x[1],x[2]-ZCAL-CALS3-ZSPEBP-HORMG};
79              
80      b[0] = TrkParams::GetBX((float *)xm)*10;        b[0] = TrkParams::GetBX((float *)xm)*10;
81      b[1] = TrkParams::GetBY((float *)xm)*10;        b[1] = TrkParams::GetBY((float *)xm)*10;
82      b[2] = TrkParams::GetBZ((float *)xm)*10;        b[2] = TrkParams::GetBZ((float *)xm)*10;
83                          
84  #else  #else
85      if(x) {   if(x) {
86        for (Int_t i=0; i<3; i++) b[i] = 0.0;      for (Int_t i=0; i<3; i++) b[i] = 0.0;
87      } else {    } else {
88        b[0]=b[1]=b[2]=0.0;      b[0]=b[1]=b[2]=0.0;
89      }    }
90  #endif  #endif
91    
92    }    }
93    

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

  ViewVC Help
Powered by ViewVC 1.1.23