Changeset a47edcc in git for external/TrackCovariance

Timestamp:

May 1, 2021, 2:15:02 PM (4 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

46d3442

Parents:

53f4746

Message:

Fixed issue with backward generated tracks

Location:

external/TrackCovariance

Files:

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

external/TrackCovariance/TrkUtil.cc

@@ -46 +46 @@
         Double_t C = a / (2 * pt);                      // Half curvature
         //std::cout << "ObsTrk::XPtoPar: fB = " << fB << ", a = " << a << ", pt = " << pt << ", C = " << C << std::endl;
-        Double_t r2 = x.Perp2();
+        Double_t r2 = x(0) * x(0) + x(1) * x(1);
         Double_t cross = x(0) * p(1) - x(1) * p(0);
         Double_t T = sqrt(pt * pt - 2 * a * cross + a * a * r2);
@@ -61 +61 @@
         Double_t st = asin(B) / C;
         Double_t ct = p(2) / pt;
-        Double_t z0 = x(2) - ct * st;
+        Double_t z0;
+        Double_t dot = x(0) * p(0) + x(1) * p(1);
+        if (dot > 0.0) z0 = x(2) - ct * st;
+        else z0 = x(2) + ct * st;
         //
         Par(3) = z0;            // Store z0
@@ -443 +446 @@
         TSpline3* sp3 = new TSpline3("sp3", bg, ncl, Npt);
         if (begam > bg[0] && begam < bg[Npt - 1]) interp = sp3->Eval(begam);
-        if(begam < bg[0]) interp = bg[0];
-        if(begam > bg[Npt-1]) interp = bg[Npt-1];
         return 100 * interp;
 }

external/TrackCovariance/TrkUtil.h

@@ -25 +25 @@
         // Service routines
         //
-        void SetB(Double_t Bz){ fBz = Bz; }
+        void SetB(Double_t Bz) { fBz = Bz; }
         TVectorD XPtoPar(TVector3 x, TVector3 p, Double_t Q);
         TVector3 ParToP(TVectorD Par);
@@ -54 +54 @@
                 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
+                return c*1.0e-9;                // Reduced speed of light       
         }
         //
@@ -71 +71 @@
         // Cluster counting in gas
         //
-        void SetBfield(Double_t Bz){ fBz = Bz; }
-        // Define gas volume (units = meters)
+        void SetBfield(Double_t Bz) { fBz = Bz; }
+        // Define gas volume (units = meters) 
         void SetDchBoundaries(Double_t Rmin, Double_t Rmax, Double_t Zmin, Double_t Zmax);
         // Gas mixture selection