Changeset 974f5bc in git

Timestamp:

Apr 17, 2020, 9:53:31 AM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

5c716fa

Parents:

09ffaee (diff), a07b54c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Pavel Demin <pavel-demin@…> (04/17/20 09:53:31)

git-committer:

GitHub <noreply@…> (04/17/20 09:53:31)

Message:

Merge pull request #72 from preghenella/rdev

Proper calculation of the DCAz coordinate

File:

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

modules/ParticlePropagator.cc

@@ -135 +135 @@
   Double_t l, d0, dz, p, ctgTheta, phip, etap, alpha;
   Double_t bsx, bsy, bsz;
-
+  Double_t s0, s1, sd;
+  
   const Double_t c_light = 2.99792458E8;
 
@@ -297 +298 @@
       zd = z + (TMath::Sqrt(xd * xd + yd * yd) - TMath::Sqrt(x * x + y * y)) * pz / pt;
 
+      // proper calculation of the DCAz coordinate
+      // s0: track circle parameter at the track origin
+      // s1: track circle parameter at the closest approach to beam pipe
+      // sd: s1-s0 signed angular difference
+      s0 = atan2(y - y_c, x - x_c);
+      s1 = atan2(yd - y_c, xd - x_c);
+      sd = atan2(sin(s1 - s0), cos(s1 - s0));
+      zd = z - r * pz / pt * sd;
+      
       // use perigee momentum rather than original particle
       // momentum, since the orignal particle momentum isn't known