Changeset 100 in svn for trunk/src/BFieldProp.cc

Timestamp:

Dec 18, 2008, 2:39:26 PM (16 years ago)

Author:

severine ovyn

Message:

Remove datacard bug + CaloTowers OK

File:

• trunk/src/BFieldProp.cc (modified) (5 diffs)

trunk/src/BFieldProp.cc

@@ -25 +25 @@
 //------------------------------------------------------------------------------
 
-TrackPropagation::TrackPropagation() {
+TrackPropagation::TrackPropagation(string DetDatacard) {
 
+ DET = new RESOLution();
+ DET->ReadDataCard(DetDatacard);
  MAXITERATION = 10000;
  MINSEGLENGTH = 70;
@@ -43 +45 @@
   
   //out of trackibg coverage?
-  if(sqrt(Xvertex1*Xvertex1+Yvertex1*Yvertex1) > TRACK_radius){return;}
-  if(fabs(Zvertex1) > TRACK_length){return;}
+  if(sqrt(Xvertex1*Xvertex1+Yvertex1*Yvertex1) > DET->TRACK_radius){return;}
+  if(fabs(Zvertex1) > DET->TRACK_length){return;}
   
   float Px = Part->Px;
@@ -62 +64 @@
      double vz = pz/M;
 
-     double Bx = TRACK_bfield_x;
-     double By = TRACK_bfield_y;
-     double Bz = TRACK_bfield_z;
+     double Bx = DET->TRACK_bfield_x;
+     double By = DET->TRACK_bfield_y;
+     double Bz = DET->TRACK_bfield_z;
 
      double ax =  (q/M)*(Bz*vy - By*vz);
@@ -80 +82 @@
      int k = 0;
      
+     double Radius=DET->TRACK_radius;
+     double Length=DET->TRACK_length;
+
      while(k < MAXITERATION){
         k++;
@@ -99 +104 @@
         z  += vz*dt;
 
-       if( (x*x+y*y) > TRACK_radius*TRACK_radius ){ x /= (x*x+y*y)/(TRACK_radius*TRACK_radius); y /= (x*x+y*y)/(TRACK_radius*TRACK_radius); break;}
-       if( fabs(z)>TRACK_length)break;
+       if( (x*x+y*y) > Radius*Radius ){ x /= (x*x+y*y)/(Radius*Radius); y /= (x*x+y*y)/(Radius*Radius); break;}
+       if( fabs(z)>Length)break;
 
        xold = x;