Changeset 64294db in git for external/TrackCovariance/VertexFit.h

Timestamp:

Apr 17, 2021, 10:26:04 AM (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

3b3071a

Parents:

3cfe61d (diff), 4df491e (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@…> (04/17/21 10:26:04)

git-committer:

GitHub <noreply@…> (04/17/21 10:26:04)

Message:

Merge pull request #94 from fbedesch/master

VertexFit.cc and TrkUtil.cc improvements

File:

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

external/TrackCovariance/VertexFit.h

@@ -7 +7 @@
 #include <TMatrixDSym.h>
 #include "ObsTrk.h"
+#include <vector>
 #include <iostream>
 //
@@ -21 +22 @@
         // Inputs
         Int_t fNtr;                                     // Number of tracks
-        TVectorD** fPar;                        // Input parameter array
-        TMatrixDSym** fCov;                     // Input parameter covariances
+        std::vector<TVectorD*> fPar;            // Input parameter array
+        std::vector<TMatrixDSym*> fCov;// Input parameter covariances
         // Constraints
         Bool_t fVtxCst;                         // Vertex constraint flag
         TVectorD fxCst;                         // Constraint value
-        TMatrixDSym fCovCst;            // Constraint covariance
+        TMatrixDSym fCovCst;                    // Constraint covariance
         //
         // Results
-        Bool_t fVtxDone;                        // Flag vertex fit completed
+        Bool_t fVtxDone;                                // Flag vertex fit completed
+        Double_t fRold;                         // Current value of vertex radius
         TVectorD fXv;                           // Found vertex
         TMatrixDSym fcovXv;                     // Vertex covariance
@@ -35 +37 @@
         TVectorD fChi2List;                     // List of Chi2 contributions
         //
-        // Transient arrays
-        Double_t* ffi;                          // Fit phases
-        TVectorD** fx0i;                        // Track expansion points
-        TVectorD** fai;                         // dx/dphi
-        Double_t* fa2i;                         // a'Wa
-        TMatrixDSym** fDi;                      // W-WBW
-        TMatrixDSym** fWi;                      // (ACA')^-1
-        TMatrixDSym** fWinvi;           // ACA'
+        // Work arrays
+        std::vector<Double_t> ffi;                              // Fit phases
+        std::vector<TVectorD*> fx0i;                            // Track expansion points
+        std::vector<TVectorD*> fai;                             // dx/dphi
+        std::vector<Double_t> fa2i;                             // a'Wa
+        std::vector<TMatrixDSym*> fDi;                  // W-WBW
+        std::vector<TMatrixDSym*> fWi;                  // (ACA')^-1
+        std::vector<TMatrixDSym*> fWinvi;               // ACA'
         //
         // Service routines
-        Double_t FastRv1(TVectorD p1, TVectorD p2);             // Fast vertex radius determination
+        //void InitWrkArrays();                                                 // Initializations
+        void ResetWrkArrays();                                                  // Clear work arrays
+        Double_t StartRadius();                                                 // Starting vertex radius determination
         Double_t FastRv(TVectorD p1, TVectorD p2);              // Fast vertex radius determination
-        TMatrixDSym RegInv3(TMatrixDSym& Smat0);                // Regularized 3D matrix inversion 
-        TMatrixD Fill_A(TVectorD par, Double_t phi);    // Derivative of track position wrt track parameters
-        TVectorD Fill_a(TVectorD par, Double_t phi);    // Derivative of track position wrt track phase
+        TMatrixDSym RegInv(TMatrixDSym& Smat0);                 // Regularized 3D matrix inversion 
+        TMatrixD Fill_A(TVectorD par, Double_t phi);            // Derivative of track position wrt track parameters
+        TVectorD Fill_a(TVectorD par, Double_t phi);            // Derivative of track position wrt track phase
         TVectorD Fill_x0(TVectorD par);                                 // Track position at dma to z-axis
-        TVectorD Fill_x(TVectorD par, Double_t phi);    // Track position at given phase
-        void VertexFinder();                                                    // Vertex finder routine
+        TVectorD Fill_x(TVectorD par, Double_t phi);            // Track position at given phase
+        void UpdateTrkArrays(Int_t i);                                  // Fill track realted arrays
+        void VertexFitter();                                                            // Vertex finder routine
 public:
         //
         // Constructors
         VertexFit();                                                                            // Initialize waiting for tracks
-        VertexFit(Int_t Ntr, ObsTrk** tracks);                          // Initialize with ObsTrk tracks
+        VertexFit(Int_t Ntr, ObsTrk** tracks);                  // Initialize with ObsTrk tracks
         VertexFit(Int_t Ntr, TVectorD** trkPar, TMatrixDSym** trkCov);  // Initialize with parameters and covariances
         // Destructor
@@ -71 +76 @@
         // Handle tracks/constraints
         void AddVtxConstraint(TVectorD xv, TMatrixDSym cov);    // Add gaussian vertex constraint
-        void AddTrk(TVectorD par, TMatrixDSym Cov);                     // Add track to input list
-        void RemoveTrk(Int_t iTrk);                                                     // Remove iTrk track
+        void AddTrk(TVectorD *par, TMatrixDSym *Cov);                           // Add track to input list
+        void RemoveTrk(Int_t iTrk);                                                             // Remove iTrk track
         //
 };