Changeset 0b8551f in git for external/TrackCovariance/SolGridCov.cc

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/SolGridCov.cc (modified) (2 diffs)

external/TrackCovariance/SolGridCov.cc

@@ -103 +103 @@
         return Accept;
 }
-
-
+//
+// Detailed acceptance check
+//
+Bool_t SolGridCov::IsAccepted(TVector3 x, TVector3 p, SolGeom* G)
+{
+        Bool_t Accept = kFALSE;
+        //
+        // Check if track origin is inside beampipe and betwen the first disks
+        //
+        Double_t Rin = G->GetRmin();
+        Double_t ZinPos = G->GetZminPos();
+        Double_t ZinNeg = G->GetZminNeg();
+        Bool_t inside = TrkUtil::IsInside(x, Rin, ZinNeg, ZinPos); // Check if in inner box
+        if (inside) Accept = IsAccepted(p);
+        else
+        {
+                SolTrack* trk = new SolTrack(x, p, G);
+                if (trk->nmHit() >= fNminHits)Accept = kTRUE;
+                delete trk;
+        }
+        //
+        return Accept;
+}
+
+//
 // Find bin in grid
 Int_t SolGridCov::GetMinIndex(Double_t xval, Int_t N, TVectorD x)
@@ -193 +216 @@
   if (!Chl.Decompose())
   {
-    cout << "SolGridCov::GetCov: Interpolated matrix not positive definite. Recovering ...." << endl;
+    std::cout << "SolGridCov::GetCov: Interpolated matrix not positive definite. Recovering ...." << std::endl;
     TMatrixDSym rCv = MakePosDef(CvN); CvN = rCv;
     TMatrixDSym DCv(5); DCv.Zero();