Changeset 291 in svn

Timestamp:

Mar 4, 2009, 1:54:41 PM (16 years ago)

Author:

Xavier Rouby

Message:

first attempt of corrections

Location:

trunk

Files:

• interface/BFieldProp.h (modified) (1 diff)
• src/BFieldProp.cc (modified) (6 diffs)

trunk/interface/BFieldProp.h

@@ -87 +87 @@
 
    unsigned int loop_overflow_counter;
+   unsigned int aaa,bbb,ccc,ddd; // to be deleted
+  
 };
   

trunk/src/BFieldProp.cc

@@ -140 +140 @@
       //cout << "gammam" << gammam << "\t gamma" << gammam/Part->M << endl;
       omega = q * B_z /gammam;
-      r = Part->PT / (omega * gammam);
+      //r = Part->PT / (omega * gammam);
+      r = fabs(Part->PT / (omega * gammam));
 
     // 2.  Helix parameters : center coordinates in transverse plane
@@ -152 +153 @@
     // 3. time evaluation t = min(t_T, t_z)
     //    t_T : time to exit from the sides
-    //    t_T= [ Phi_c - phi_0 + atan( (R_max^2 - (R_c^2 + r^2))/(2rR_c) )  ]/omega
+    //    t_T= [ Phi_c - phi_0 + acos( (R_max^2 - (R_c^2 + r^2))/(2rR_c) )  ]/omega
     //    t_z : time to exit from the front or the back
     //    t_z = gamma * m /p_z0 \times (-z_0 + z_max * sign(p_z0))
@@ -161 +162 @@
       if ( fabs(R_c - r) > R_max || R_c + r  < R_max ) t = t_z;
       else {
-         t_T = (Phi_c - phi_0 + atan2( (R_max + rr)*(R_max - rr) , 2*r*R_c ) ) / omega; 
+         if(r==0|| R_c ==0) t_T=1E99;
+         //else t_T = (Phi_c - phi_0 + atan2( (R_max + rr)*(R_max - rr) , 2*r*R_c ) ) / omega; 
+         else t_T = (Phi_c - phi_0 + acos( (R_max + rr)*(R_max - rr) / (2*r*R_c) ) ) / omega; 
          t = min(t_T,t_z);
       }
@@ -345 +348 @@
       //cout << "gammam" << gammam << "\t gamma" << gammam/Part->M << endl;
       omega = q * B_z /gammam;
-      r = Part->PT / (omega * gammam);
+      r = fabs(Part->PT / (omega * gammam));
 
     // 2.  Helix parameters : center coordinates in transverse plane
@@ -357 +360 @@
     // 3. time evaluation t = min(t_T, t_z)
     //    t_T : time to exit from the sides
-    //    t_T= [ Phi_c - phi_0 + atan( (R_max^2 - (R_c^2 + r^2))/(2rR_c) )  ]/omega
+    //    t_T= [ Phi_c - phi_0 + acos( (R_max^2 - (R_c^2 + r^2))/(2rR_c) )  ]/omega
     //    t_z : time to exit from the front or the back
     //    t_z = gamma * m /p_z0 \times (-z_0 + z_max * sign(p_z0))
@@ -366 +369 @@
       if ( fabs(R_c - r) > R_max || R_c + r  < R_max ) t = t_z;
       else {
-         t_T = (Phi_c - phi_0 + atan2( (R_max + rr)*(R_max - rr) , 2*r*R_c ) ) / omega; 
+         if(r==0|| R_c ==0) t_T=1E99;
+         //else t_T = (Phi_c - phi_0 + atan2( (R_max + rr)*(R_max - rr) , 2*r*R_c ) ) / omega;
+         else t_T = (Phi_c - phi_0 + acos( (R_max + rr)*(R_max - rr) / (2*r*R_c) ) ) / omega;
          t = min(t_T,t_z);
       }