Changeset b594101 in git

Timestamp:

Dec 19, 2014, 11:39:10 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

764f12a0

Parents:

c59be54

Message:

remove unneeded variables and fix formatting

File:

• modules/ParticlePropagator.cc (modified) (8 diffs)

modules/ParticlePropagator.cc

@@ -120 +120 @@
   Double_t tmp, discr, discr2;
   Double_t delta, gammam, omega, asinrho;
-  Double_t ang_mom, rcu, rc2, dxy, xd, yd, zd;
-  
+  Double_t rcu, rc2, dxy, xd, yd, zd;
+
   const Double_t c_light = 2.99792458E8;
 
@@ -158 +158 @@
       discr2 = pt2*fRadius2 - tmp*tmp;
 
-      if(discr2 < 0)
+      if(discr2 < 0.0)
       {
         // no solutions
@@ -168 +168 @@
       t1 = (-tmp + discr)/pt2;
       t2 = (-tmp - discr)/pt2;
-      t = (t1 < 0) ? t2 : t1;
+      t = (t1 < 0.0) ? t2 : t1;
 
       z_t = z + pz*t;
@@ -175 +175 @@
         t3 = (+fHalfLength - z) / pz;
         t4 = (-fHalfLength - z) / pz;
-        t = (t3 < 0) ? t4 : t3;
+        t = (t3 < 0.0) ? t4 : t3;
       }
 
@@ -209 +209 @@
     {
 
-      // 1.  initial transverse momentum p_{T0} : Part->pt
-      //     initial transverse momentum direction \phi_0 = -atan(p_X0/p_Y0)
-      //     relativistic gamma : gamma = E/mc² ; gammam = gamma \times m
-      //     giration frequency \omega = q/(gamma m) fBz
-      //     helix radius r = p_T0 / (omega gamma m)
-
-      gammam = e*1.0E9 / (c_light*c_light);      // gammam in [eV/c²]
-      omega = q * fBz / (gammam);                // omega is here in [ 89875518 / s]
+      // 1.  initial transverse momentum p_{T0}: Part->pt
+      //     initial transverse momentum direction phi_0 = -atan(p_X0/p_Y0)
+      //     relativistic gamma: gamma = E/mc^2; gammam = gamma * m
+      //     gyration frequency omega = q/(gamma m) fBz
+      //     helix radius r = p_{T0} / (omega gamma m)
+
+      gammam = e*1.0E9 / (c_light*c_light);      // gammam in [eV/c^2]
+      omega = q * fBz / (gammam);                // omega is here in [89875518/s]
       r = pt / (q * fBz) * 1.0E9/c_light;        // in [m]
 
-      phi_0 = TMath::ATan2(py, px); // [rad] in [-pi; pi]
+      phi_0 = TMath::ATan2(py, px); // [rad] in [-pi, pi]
 
       // 2. helix axis coordinates
@@ -231 +231 @@
       rcu = TMath::Abs(r);
       rc2 = r_c*r_c;
-     
+
       // calculate coordinates of closest approach to track circle in transverse plane xd, yd, zd
-      xd = x_c*x_c*x_c - x_c*rcu*r_c + x_c*y_c*y_c; 
-      xd  = ( rc2 > 0.0 ) ? xd / rc2 : -999;
-      yd  = y_c*(-rcu*r_c + rc2);
-      yd  = ( rc2 > 0.0 ) ? yd / rc2 : -999;
-      zd  = z + (TMath::Sqrt(xd*xd+yd*yd) - TMath::Sqrt(x*x+y*y))*pz/pt;
+      xd = x_c*x_c*x_c - x_c*rcu*r_c + x_c*y_c*y_c;
+      xd = (rc2 > 0.0) ? xd / rc2 : -999;
+      yd = y_c*(-rcu*r_c + rc2);
+      yd = (rc2 > 0.0) ? yd / rc2 : -999;
+      zd = z + (TMath::Sqrt(xd*xd + yd*yd) - TMath::Sqrt(x*x + y*y))*pz/pt;
 
       // calculate impact paramater
-      ang_mom = (xd*py - yd*px);
-      dxy = ang_mom/pt;
-    
-         
+      dxy = (xd*py - yd*px)/pt;
+
       // 3. time evaluation t = TMath::Min(t_r, t_z)
       //    t_r : time to exit from the sides
@@ -270 +268 @@
         t6 = (delta - TMath::Pi() + asinrho) / omega;
 
-        if(t1 < 0) t1 = 1.0E99;
-        if(t2 < 0) t2 = 1.0E99;
-        if(t3 < 0) t3 = 1.0E99;
-        if(t4 < 0) t4 = 1.0E99;
-        if(t5 < 0) t5 = 1.0E99;
-        if(t6 < 0) t6 = 1.0E99;
+        if(t1 < 0.0) t1 = 1.0E99;
+        if(t2 < 0.0) t2 = 1.0E99;
+        if(t3 < 0.0) t3 = 1.0E99;
+        if(t4 < 0.0) t4 = 1.0E99;
+        if(t5 < 0.0) t5 = 1.0E99;
+        if(t6 < 0.0) t6 = 1.0E99;
 
         t_ra = TMath::Min(t1, TMath::Min(t2, t3));
@@ -297 +295 @@
 
         candidate->Momentum = candidateMomentum;
-        candidate->Xd = xd*1.0E3; 
-        candidate->Yd = yd*1.0E3;
+        candidate->Xd = xd*1.0E3;
+        candidate->Yd = yd*1.0E3;
         candidate->Zd = zd*1.0E3;
-        
-        candidate->AddCandidate(mother);
+
+        candidate->AddCandidate(mother);
 
         fOutputArray->Add(candidate);