Changeset 90 in svn for trunk/src

Timestamp:

Dec 5, 2008, 9:34:52 AM (16 years ago)

Author:

severine ovyn

Message:

remove 1 bug in BField prop

File:

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

trunk/src/BFieldProp.cc

@@ -27 +27 @@
 TrackPropagation::TrackPropagation() {
 
- MAXITERATION = 20000;
+ MAXITERATION = 10000;
  MINSEGLENGTH = 70;
 
@@ -57 +57 @@
  
   if(q!=0){
-     double e  = Part->E  / 0.003;
-//     double M  = sqrt(e*e - (px*px + py*py + pz*pz) );
      double M  = Part->M;
-/*if(fabs(Part->PID)==11)
-{
-     cout<<"genMomentum.M() "<<genMomentum.M()<<"  "<<Part->M<<endl;
-     cout<<"e*e - (px*px + py*py + pz*pz) "<<e*e - (px*px + py*py + pz*pz)<<endl;
-}*/
      double vx = px/M;
      double vy = py/M;
@@ -76 +69 @@
      double ay =  (q/M)*(Bx*vz - Bz*vx);
      double az =  (q/M)*(By*vx - Bx*vy);
-/*
-cout<<"M "<<M<<" et le pid "<<Part->PID<<endl;
-cout<<"ax "<<ax<<" ay "<<ay<<" az "<<az<<endl;
-*/
      double dt = 1/p;
      if(pt<266 && vz < 0.0012)       dt = fabs(0.001/vz);
@@ -120 +109 @@
       if(x!=0 && y!=0 && z!=0)
         {
-          double theta = fabs(atan(y/z));
           double eta;
-          if(z > 0)eta = -log(tan(theta/2));
-          else eta = -(-log(tan(theta/2)));
+          float Theta = atan2(sqrt(x*x+y*y),z);
+          eta  = -log(tan(Theta/2));
           double phi = atan2(y,x);
           genMomentum.SetPtEtaPhiE(Part->PT,eta,phi,Part->E);
         }
-     // cout<<"genMomentum final "<<genMomentum.Pt()<<endl;
     }
 }