small bug fix in 2D_tracking

ronshnapp · Oct 2, 2023 · 88b2e9c · 88b2e9c
1 parent 6b81c66
commit 88b2e9c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/Readme.md b/Readme.md
@@ -1,5 +1,5 @@
 December 25, 2022
-Version: 0.6.4
+Version: 0.6.5
 
 <img src="./user_manual/figs/logo.png" style="zoom:20%;" />
 

diff --git a/myptv/tracking_2D_mod.py b/myptv/tracking_2D_mod.py
@@ -40,7 +40,8 @@ class track_2D(tracker_four_frames):
     '''
 
     def __init__(self, camera, blob_fnames, z_particles, mean_flow = 0.0, 
-                 d_max=1e10, dv_max=1e10, reverse_eta_zeta = False):
+                 d_max=1e10, dv_max=1e10, reverse_eta_zeta = False,
+                 store_candidates=False):
         '''
         inputs -
         
@@ -68,6 +69,11 @@ def __init__(self, camera, blob_fnames, z_particles, mean_flow = 0.0,
                            data points were given where the x, y coordinates
                            are transposed (as happens, e.g., if using 
                            matplotlib.pyplot.imshow).
+        
+        store_candidates - boolean indicator, defaul on False. If True, the 
+                           tracker will store all the candidate links that were 
+                           considered in the tracking process for future 
+                           analysis.
         '''
 
         self.cam = camera
@@ -89,6 +95,7 @@ def __init__(self, camera, blob_fnames, z_particles, mean_flow = 0.0,
         self.traj_lengths = {}
         self.N_four_frames = 0
         self.N_nearest_neighbour = 0
+        self.store_candidates = store_candidates
 
 
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 setup(
     name='myptv',
     packages=find_packages(include=['myptv']),
-    version='0.6.4',
+    version='0.6.5',
     description='A 3D Particle Tracking Velocimetry library',
     install_requires=['numpy', 'scipy', 'scikit-image','pandas','matplotlib','pyyaml', 'tk', 'Pillow'],
     author='Ron Shnapp',

diff --git a/user_manual/user_manual.log b/user_manual/user_manual.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2023.7.13)  12 AUG 2023 18:55
+This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2023.7.13)  2 OCT 2023 23:44
 entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
@@ -765,7 +765,7 @@ fb></usr/share/texmf/fonts/type1/public/cm-super/sfti1000.pfb></usr/share/texmf
 /fonts/type1/public/cm-super/sftt0900.pfb></usr/share/texmf/fonts/type1/public/
 cm-super/sftt1000.pfb></usr/share/texmf/fonts/type1/public/cm-super/sftt1200.pf
 b></usr/share/texmf/fonts/type1/public/cm-super/sftt1440.pfb>
-Output written on user_manual.pdf (29 pages, 4016879 bytes).
+Output written on user_manual.pdf (29 pages, 4016843 bytes).
 PDF statistics:
  882 PDF objects out of 1000 (max. 8388607)
  757 compressed objects within 8 object streams

diff --git a/user_manual/user_manual.pdf b/user_manual/user_manual.pdf
diff --git a/user_manual/user_manual.tex b/user_manual/user_manual.tex
@@ -66,7 +66,7 @@
 
 \begin{minipage}{14cm}
 	{\small \sffamily
-	Version: 0.6.4 \\
+	Version: 0.6.5 \\
 	Last updated: \today \\
 	Github repository: \url{https://github.com/ronshnapp/MyPTV} \\
 	Get help \& interact with our community: \url{https://github.com/ronshnapp/MyPTV/discussions}\\