Changeset 0b8551f in git for external/TrackCovariance/ObsTrk.h

Timestamp:

Nov 29, 2021, 4:04:38 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

0c0c9af

Parents:

9a7ea36 (diff), bd376e3 (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@…> (11/29/21 16:04:38)

git-committer:

GitHub <noreply@…> (11/29/21 16:04:38)

Message:

Merge pull request #102 from fbedesch/master

Major update to handle highly displaced tracks

File:

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

external/TrackCovariance/ObsTrk.h

@@ -6 +6 @@
 #include <TMatrixDSym.h>
 #include <TDecompChol.h>
+#include "SolGeom.h"
 #include "TrkUtil.h"
 #include "SolGridCov.h"
@@ -23 +24 @@
 private:        
         Double_t fB;                                    // Solenoid magnetic field
-        SolGridCov *fGC;                                // Covariance matrix grid
+        SolGridCov* fGC;                                // Covariance matrix grid
+        SolGeom*    fG;                                 // Tracker geometry
         Double_t fGenQ;                                 // Generated track charge
         Double_t fObsQ;                                 // Observed  track charge
@@ -47 +49 @@
         // Service routines
         //
-        TVectorD GenToObsPar(TVectorD gPar, SolGridCov* GC);
+        TVectorD GenToObsPar(TVectorD gPar);
         //
 public:
@@ -53 +55 @@
         // Constructors
         // x(3) track origin, p(3) track momentum at origin, Q charge, B magnetic field in Tesla
-        ObsTrk(TVector3 x, TVector3 p, Double_t Q, Double_t B, SolGridCov *GC); // Initialize and generate smeared 
-        ObsTrk(Double_t *x, Double_t *p, Double_t Q, Double_t B, SolGridCov* GC);       // Initialize and generate smeared track
+        ObsTrk(TVector3 x, TVector3 p, Double_t Q, SolGridCov *GC, SolGeom *G); // Initialize and generate smeared 
+        ObsTrk(Double_t *x, Double_t *p, Double_t Q, SolGridCov* GC, SolGeom *G);       // Initialize and generate smeared track
         // Destructor
         ~ObsTrk();