diff --git a/Readme.md b/Readme.md index e0ba4c5..16454c2 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ -October 27, 2024 +October 31, 2024 -Version: 1.1.0 +Version: 1.1.1 diff --git a/myptv/segmentation_mod.py b/myptv/segmentation_mod.py index 3a18421..3ba5ef4 100644 --- a/myptv/segmentation_mod.py +++ b/myptv/segmentation_mod.py @@ -619,7 +619,14 @@ class tracking_augmented_segmentation(track_2D_multiframe): def __init__(self, fname, max_dt, Ns, d_max=1e10, dv_max=1e10, NSR_th=0.25): ''' + A class that uses 2D tracking of segmented blobs using the multiframe + algorithm, and then "missing particle" interpolation in attempt to + fill in for occlusions. + fname - name of a file with blobs to be tracking augmented + + max_dt, Ns, d_max, dv_max, NSR_th - tracking related to the multiframe + tracking used. See the class over in tracking_mod for details. ''' self.fname = fname @@ -731,15 +738,17 @@ def save_augmented_blobs(self, fname): -if __name__ == '__main__': - fn = '/home/ron/Desktop/Research/jetArrayTank/20241020_puffs/Rec18/blobs_cam4' - dt_max = 3 - Ns = 9 - t2d = tracking_augmented_segmentation(fn, dt_max, Ns, d_max=3, dv_max=3) - t2d.blobs_to_particles() - t2d.augment_blobs() - - t2d.save_augmented_blobs('blobs_cam4_augmented') +# ============================================================================= +# if __name__ == '__main__': +# fn = '/home/ron/Desktop/Research/jetArrayTank/20241020_puffs/Rec18/blobs_cam4' +# dt_max = 3 +# Ns = 9 +# t2d = tracking_augmented_segmentation(fn, dt_max, Ns, d_max=3, dv_max=3) +# t2d.blobs_to_particles() +# t2d.augment_blobs() +# +# t2d.save_augmented_blobs('blobs_cam4_augmented') +# ============================================================================= diff --git a/setup.py b/setup.py index 90abe3f..f9dbea0 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='myptv', packages=find_packages(include=['myptv', 'myptv.fibers', 'myptv.TsaiModel', 'myptv.extendedZolof', 'myptv.makePlots', 'myptv.sheets']), - version='1.1.0', + version='1.1.1', description='A 3D Particle Tracking Velocimetry library', install_requires=['numpy', 'scipy', 'scikit-image','pandas','matplotlib','pyyaml', 'tk', 'Pillow>=9.5.0'], author='Ron Shnapp', diff --git a/user_manual/user_manual.log b/user_manual/user_manual.log index 0b1b376..3431185 100644 --- 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) 27 OCT 2024 13:23 +This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2023.7.13) 31 OCT 2024 18:21 entering extended mode restricted \write18 enabled. %&-line parsing enabled. @@ -875,7 +875,7 @@ sr/share/texmf/fonts/type1/public/cm-super/sfsx2488.pfb> -Output written on user_manual.pdf (39 pages, 3696309 bytes). +Output written on user_manual.pdf (39 pages, 3696449 bytes). PDF statistics: 1051 PDF objects out of 1200 (max. 8388607) 901 compressed objects within 10 object streams diff --git a/user_manual/user_manual.pdf b/user_manual/user_manual.pdf index 259e3e9..dd3b4f1 100644 Binary files a/user_manual/user_manual.pdf and b/user_manual/user_manual.pdf differ diff --git a/user_manual/user_manual.tex b/user_manual/user_manual.tex index 2bcc31d..dda6393 100644 --- a/user_manual/user_manual.tex +++ b/user_manual/user_manual.tex @@ -66,7 +66,7 @@ \begin{minipage}{14cm} {\small \sffamily - Version: 1.1.0 \\ + Version: 1.1.1 \\ Last updated: \today \\ Github repository: \url{https://github.com/ronshnapp/MyPTV} \\ Get help \& interact with our community: \url{https://github.com/ronshnapp/MyPTV/discussions}\\