Changeset 4e5ed02 in git for external/TrackCovariance/ObsTrk.h

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:

• external/TrackCovariance/ObsTrk.h (modified) (3 diffs)

external/TrackCovariance/ObsTrk.h

@@ -29 +29 @@
         TVector3 fObsP;                                 // Observed  track momentum @ track minimum approach
         TVectorD fGenPar;                               // Generated helix track parameters (D, phi0, C, z0, cot(th))
-        TVectorD fGenParACTS;                   // Generated helix track parameters (D, z0, phi0, th, q/p, time)
+        TVectorD fGenParACTS;                   // Generated helix track parameters (D, z0, phi0, th, q/p, time
+        TVectorD fGenParILC;                            // Generated helix track parameters (w, phi0, d0, z0, tan(lambda))
         TVectorD fObsPar;                               // Observed  helix track parameters (D, phi0, C, z0, cot(th))
-        TVectorD fObsParACTS;                   // Observed  helix track parameters (D, z0, phi0, th, q/p, time)
+        TVectorD fObsParACTS;                   // Observed  helix track parameters (D, z0, phi0, th, q/p, time
+        TVectorD fObsParILC;                            // Observed  helix track parameters (d0, phi0, w, z0, tan(lambda))
         TMatrixDSym fCov;                               // INterpolated covariance of track parameters
         TMatrixDSym fCovACTS;                   // Covariance of track parameters in ACTS format
                                                                         // (D, z0, phi0, theta, q/p, time)
+        TMatrixDSym fCovILC;                            // Covariance of track parameters in ILC format
+                                                                        // (d0, phi0, w, z0, tan(lambda))
         //
         // Conversion to ACTS parametrization
         //
         TVectorD ParToACTS(TVectorD Par);               // Parameter conversion
-        TMatrixDSym CovToACTS(TMatrixDSym Cov); // Covariance conversion
+        TMatrixDSym CovToACTS(TMatrixDSym Cov); // Covariance 
+        //
+        // Conversion to ILC parametrization
+        //
+        TVectorD ParToILC(TVectorD Par);                // Parameter conversion
+        TMatrixDSym CovToILC(TMatrixDSym Cov);  // Covariance conversion
         //
 public:
@@ -68 +77 @@
         // D, z0, phi0, theta, q/p, time
         TVectorD GetGenParACTS()        { return fGenParACTS; }
+        // d0, phi0, w, z0, tan(lambda)
+        TVectorD GetGenParILC() { return fGenParILC; }
         // Observed level X, P, Q
         Double_t GetObsQ()      { return fObsQ; }
@@ -76 +87 @@
         // D, z0, phi0, theta, q/p, time
         TVectorD GetObsParACTS()        { return fObsParACTS; }
+        // d0, phi0, w, z0, tan(lambda)
+        TVectorD GetObsParILC() { return fObsParILC; }
         // Covariances
         TMatrixDSym GetCov(){ return fCov; }
-        TMatrixDSym GetCovACTS(){ return fCovACTS; };
+        TMatrixDSym GetCovACTS(){ return fCovACTS; }
+        TMatrixDSym GetCovILC(){ return fCovILC; }
 };