Changeset a1a25d4 in git for external

Timestamp:

Mar 2, 2021, 3:38:05 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

4586f8f

Parents:

d3165fa (diff), 92b8d11 (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:

Michele Selvaggi <michele.selvaggi@…> (03/02/21 15:38:05)

git-committer:

GitHub <noreply@…> (03/02/21 15:38:05)

Message:

Merge pull request #85 from fbedesch/master

Fixed compatibility with ROOT5/minor changes to TrkUtil

Location:

external/TrackCovariance

Files:

• TrkUtil.cc (modified) (7 diffs)
• TrkUtil.h (modified) (3 diffs)

external/TrackCovariance/TrkUtil.cc

@@ -1 +1 @@
 #include "TrkUtil.h"
+#include <iostream>
 
 // Constructor
@@ -31 +32 @@
         Double_t cross = x(0) * p(1) - x(1) * p(0);
         Double_t T = sqrt(pt * pt - 2 * a * cross + a * a * r2);
-        Double_t phi0 = TMath::ATan2((p(1) - a * x(0)) / T, (p(0) + a * x(1)) / T);     // Phi0
+        Double_t phi0 = atan2((p(1) - a * x(0)) / T, (p(0) + a * x(1)) / T);    // Phi0
         Double_t D;                                                     // Impact parameter D
         if (pt < 10.0) D = (T - pt) / a;
@@ -41 +42 @@
         //Longitudinal parameters
         Double_t B = C * sqrt(TMath::Max(r2 - D * D, 0.0) / (1 + 2 * C * D));
-        Double_t st = TMath::ASin(B) / C;
+        Double_t st = asin(B) / C;
         Double_t ct = p(2) / pt;
         Double_t z0 = x(2) - ct * st;
@@ -68 +69 @@
         //
         TVector3 Xval;
-        Xval(0) = -D * TMath::Sin(phi0);
-        Xval(1) = D * TMath::Cos(phi0);
+        Xval(0) = -D * sin(phi0);
+        Xval(1) = D * cos(phi0);
         Xval(2) = z0;
         //
@@ -76 +77 @@
 //
 TVector3 TrkUtil::ParToP(TVectorD Par)
+{
+        if (fBz == 0.0)
+std::cout << "TrkUtil::ParToP: Warning Bz not set" << std::endl;
+        //
+        return ParToP(Par,fBz);
+}
+//
+TVector3 TrkUtil::ParToP(TVectorD Par, Double_t Bz)
 {
         Double_t C = Par(2);
@@ -82 +91 @@
         //
         TVector3 Pval;
-        Double_t pt = fBz * cSpeed() / TMath::Abs(2 * C);
-        Pval(0) = pt * TMath::Cos(phi0);
-        Pval(1) = pt * TMath::Sin(phi0);
+        Double_t pt = Bz * cSpeed() / TMath::Abs(2 * C);
+        Pval(0) = pt * cos(phi0);
+        Pval(1) = pt * sin(phi0);
         Pval(2) = pt * ct;
         //
@@ -103 +112 @@
         Double_t b = -cSpeed() * fBz / 2.;
         pACTS(0) = 1000 * Par(0);               // D from m to mm
-        pACTS(1) = 1000 * Par(3);       // z0 from m to mm
+        pACTS(1) = 1000 * Par(3);               // z0 from m to mm
         pACTS(2) = Par(1);                      // Phi0 is unchanged
-        pACTS(3) = TMath::ATan2(1.0, Par(4));           // Theta in [0, pi] range
+        pACTS(3) = atan2(1.0, Par(4));          // Theta in [0, pi] range
         pACTS(4) = Par(2) / (b * sqrt(1 + Par(4) * Par(4)));            // q/p in GeV
         pACTS(5) = 0.0;                         // Time: currently undefined

external/TrackCovariance/TrkUtil.h

@@ -20 +20 @@
         void SetBfield(Double_t Bz) { fBz = Bz; }
         TVectorD XPtoPar(TVector3 x, TVector3 p, Double_t Q);
-        TVector3 ParToX(TVectorD Par);
         TVector3 ParToP(TVectorD Par);
-        Double_t ParToQ(TVectorD Par);
         //
         // Conversion to ACTS parametrization
@@ -46 +44 @@
         static Double_t cSpeed()
         {
-                return TMath::C()*1.0e-9;       // Reduced speed of light
+                Double_t c = 2.99792458e8;      // speed of light m/sec
+                //return TMath::C()*1.0e-9;     // Incompatible with root5
+                return c*1.0e-9;                // Reduced speed of light       
         }
         //
@@ -52 +52 @@
         //
         static TVectorD XPtoPar(TVector3 x, TVector3 p, Double_t Q, Double_t Bz);
+        static TVector3 ParToX(TVectorD Par);                           // position of minimum distance from z axis
+        static TVector3 ParToP(TVectorD Par, Double_t Bz);      // Get Momentum from track parameters
+        static Double_t ParToQ(TVectorD Par);                           // Get track charge
         //
         // Conversion from meters to mm