Changeset 4e5ed02 in git for modules/TrackCovariance.cc

Timestamp:

Jul 22, 2020, 9:04:47 PM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

25291dd, a3261d7

Parents:

c18dca6 (diff), cbeb9b2 (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:

Stephen Sekula <stephensekula@…> (07/22/20 21:04:47)

git-committer:

GitHub <noreply@…> (07/22/20 21:04:47)

Message:

Merge pull request #1 from delphes/master

Synchronizing to delphes upstream master

File:

• modules/TrackCovariance.cc (modified) (4 diffs)

modules/TrackCovariance.cc

@@ -96 +96 @@
   Candidate *candidate, *mother;
   Double_t mass, p, pt, q, ct;
-  Double_t dd0, ddz, dphi, dct, dp, dpt;
+  Double_t dd0, ddz, dphi, dct, dp, dpt, dC;
   
 
@@ -115 +115 @@
     candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T());
     
-    // save full ACTS friendly covariance matrix internally (6x6: D, z0, phi0, theta, q/p, time)
-    candidate->TrackCovarianceACTS = track.GetCovACTS();
+    // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta))
+    candidate->TrackCovariance = track.GetCov();
 
     pt = candidate->Momentum.Pt();
@@ -128 +128 @@
     
     candidate->D0 = track.GetObsPar()[0];
+    candidate->Phi = track.GetObsPar()[1];
+    candidate->C = track.GetObsPar()[2];
     candidate->DZ = track.GetObsPar()[3];
+    candidate->CtgTheta = track.GetObsPar()[4];
     candidate->P  = track.GetObsP().Mag();
-    candidate->CtgTheta = track.GetObsPar()[4];
-    candidate->Phi = track.GetObsPar()[1];
-
     candidate->PT = pt;
     candidate->Charge = q;
@@ -142 +142 @@
     dpt       = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz);
     dp        = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct));
+    dC        = TMath::Sqrt(track.GetCov()(2, 2));
 
     candidate->ErrorD0 = dd0;
     candidate->ErrorDZ = ddz;
     candidate->ErrorP = dp;
+    candidate->ErrorC = dC;
     candidate->ErrorCtgTheta = dct;
     candidate->ErrorPhi = dphi;