Changes in external/TrackCovariance/SolGridCov.cc [170a11d:ebf40fd] in git

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();