Added finishing position information as a way to reduce overlap.

dirac-institute · May 5, 2016 · 6f796ef · 6f796ef
1 parent 549e5bb
commit 6f796ef
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/code/createImage.py b/code/createImage.py
@@ -333,7 +333,7 @@ def findLikelyTrajectories(self, psiArray, phiArray,
         velArr = np.array([vRow, vCol]).T
 
         psfPixelArea = np.pi*(psfSigma**2)
-        tempResults = int(np.ceil(psfPixelArea)*numResults)
+        tempResults = int(np.ceil(psfPixelArea)*numResults)*2
 
         topVel = np.zeros((tempResults, 2))
         topT0 = np.zeros((tempResults,2))
@@ -378,7 +378,8 @@ def findLikelyTrajectories(self, psiArray, phiArray,
             testVel = topVel[rankings][objNum]
             keepVal = True
             for t0, vel in zip(keepT0, keepVel):
-                if ((euclidean(testT0, t0) < psfSigma) and (np.array_equal(testVel, vel))):
+                if ((euclidean(testT0, t0) <= psfSigma) and ((euclidean(testT0+(testVel*timeArr[-1]), 
+                                                                       t0+(vel*timeArr[-1])) <= psfSigma))):
                     keepVal=False
             if keepVal == True:
                 keepT0[resultsSet] = testT0