Changeset 91ef0b8 in git for external/TrackCovariance/TrkUtil.cc

Timestamp:

Mar 7, 2021, 9:48:26 AM (4 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

bd33fce

Parents:

0d65492 (diff), 363e269 (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.

Message:

Fixed conflicts and Reginv3

File:

• external/TrackCovariance/TrkUtil.cc (modified) (7 diffs)

external/TrackCovariance/TrkUtil.cc

@@ -1 +1 @@
 #include "TrkUtil.h"
+#include <TMath.h>
 #include <iostream>
 
@@ -31 +32 @@
         Double_t r2 = x.Perp2();
         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 = atan2((p(1) - a * x(0)) / T, (p(0) + a * x(1)) / T);    // Phi0
+        Double_t T = TMath::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 D;                                                     // Impact parameter D
         if (pt < 10.0) D = (T - pt) / a;
@@ -41 +42 @@
         Par(2) = C;             // Store C
         //Longitudinal parameters
-        Double_t B = C * sqrt(TMath::Max(r2 - D * D, 0.0) / (1 + 2 * C * D));
-        Double_t st = asin(B) / C;
+        Double_t B = C * TMath::Sqrt(TMath::Max(r2 - D * D, 0.0) / (1 + 2 * C * D));
+        Double_t st = TMath::ASin(B) / C;
         Double_t ct = p(2) / pt;
         Double_t z0 = x(2) - ct * st;
@@ -69 +70 @@
         //
         TVector3 Xval;
-        Xval(0) = -D * sin(phi0);
-        Xval(1) = D * cos(phi0);
+        Xval(0) = -D * TMath::Sin(phi0);
+        Xval(1) = D * TMath::Cos(phi0);
         Xval(2) = z0;
         //
@@ -92 +93 @@
         TVector3 Pval;
         Double_t pt = Bz * cSpeed() / TMath::Abs(2 * C);
-        Pval(0) = pt * cos(phi0);
-        Pval(1) = pt * sin(phi0);
+        Pval(0) = pt * TMath::Cos(phi0);
+        Pval(1) = pt * TMath::Sin(phi0);
         Pval(2) = pt * ct;
         //
@@ -114 +115 @@
         pACTS(1) = 1000 * Par(3);               // z0 from m to mm
         pACTS(2) = Par(1);                      // Phi0 is unchanged
-        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(3) = TMath::ATan2(1.0, Par(4));           // Theta in [0, pi] range
+        pACTS(4) = Par(2) / (b * TMath::Sqrt(1 + Par(4) * Par(4)));             // q/p in GeV
         pACTS(5) = 0.0;                         // Time: currently undefined
         //
@@ -132 +133 @@
         A(0, 0) = 1000.;                // D-D  conversion to mm
         A(1, 2) = 1.0;          // phi0-phi0
-        A(2, 4) = 1.0 / (sqrt(1.0 + ct * ct) * b);      // q/p-C
+        A(2, 4) = 1.0 / (TMath::Sqrt(1.0 + ct * ct) * b);       // q/p-C
         A(3, 1) = 1000.;                // z0-z0 conversion to mm
         A(4, 3) = -1.0 / (1.0 + ct * ct); // theta - cot(theta)
-        A(4, 4) = -C * ct / (b * pow(1.0 + ct * ct, 3.0 / 2.0)); // q/p-cot(theta)
+        A(4, 4) = -C * ct / (b * TMath::Power(1.0 + ct * ct, 3.0 / 2.0)); // q/p-cot(theta)
         //
         TMatrixDSym Cv = Cov;