flowtracks 1.5.2.dev1__py3-none-any.whl → 1.5.2.dev2__py3-none-any.whl

flowtracks/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.5.2.dev1'
-__version_tuple__ = version_tuple = (1, 5, 2, 'dev1')
+__version__ = version = '1.5.2.dev2'
+__version_tuple__ = version_tuple = (1, 5, 2, 'dev2')
 
-__commit_id__ = commit_id = 'g647525d37'
+__commit_id__ = commit_id = 'gd0fd559b2'

flowtracks/smoothing.py

@@ -112,7 +112,12 @@ def savitzky_golay(trajs, fps, window_size, order, min_window=None):
         steps = np.diff(time)
         observed = slice(None)
         if len(steps) and np.any(steps != steps.min()) and steps.min() > 0:
-            grid = np.arange(time[0], time[-1] + steps.min() / 2, steps.min())
+            # grid step must divide every step (frames 37,40,43,46,68: 1, not
+            # 3), or observed frames fall between grid points
+            step = steps.min()
+            if np.all(steps == np.round(steps)):
+                step = np.gcd.reduce(np.round(steps).astype(np.int64))
+            grid = np.arange(time[0], time[-1] + step / 2, step)
             pos = np.column_stack([np.interp(grid, time, pos[:, k]) for k in range(pos.shape[1])])
             observed = np.searchsorted(grid, time)
         if len(pos) < min_window:

{flowtracks-1.5.2.dev1.dist-info → flowtracks-1.5.2.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowtracks
-Version: 1.5.2.dev1
+Version: 1.5.2.dev2
 Summary: Library for handling 3D PTV trajectory databases and Lagrangian/Eulerian turbulence post-processing.
 Author-email: Yosef Meller <yosefm@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{flowtracks-1.5.2.dev1.dist-info → flowtracks-1.5.2.dev2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 flowtracks/__init__.py,sha256=xiesgch7w7Q6NgdtsoGmMF5WIte5kVb1RSvthU0okbA,1247
-flowtracks/_version.py,sha256=SE8cTtlNG3Qny6l8o6gSd1H6vLJOuqyhPTDU9phov88,541
+flowtracks/_version.py,sha256=kDE8iMPFZ3xv2wL9Ny1vUmCGVqByGkW8PEBqOv4-3vM,541
 flowtracks/an_scene.py,sha256=T8w2yYzXKpwzoB8yKByOwtyelT-Egpqbo7n0VAkuZBI,6882
 flowtracks/analysis.py,sha256=rqaijjiRiDVavqMFeHbkHHUpcLWTmQFjUOGRDAK1_mc,5954
 flowtracks/combine.py,sha256=qaPo8kWxOdZTOHcHDgExz-_xVkHby5TkZQgdLFzTFxg,4375
@@ -19,31 +19,31 @@ flowtracks/provenance.py,sha256=ptdau78fruHa4fmWY2yirt02HlXGGEj8a4jFdrNcpAM,2035
 flowtracks/repair.py,sha256=wvm5fDhBn3VKTKiG_G_FqGGUFGKDg1TGz4yoHWO5544,19042
 flowtracks/scene.py,sha256=_MGeVIyHjMFs3wCAGPLMCmpi-OtlhaZqaS25fSYV2aE,18947
 flowtracks/sequence.py,sha256=4UcFgghXebWZiG6he3JgrBuAAJXQtmKYBkKlo1wP0A0,12890
-flowtracks/smoothing.py,sha256=2gmBf8o7BIZYXK1iURwIL8VbAFjjwmceXGYj_oXlFbg,7005
+flowtracks/smoothing.py,sha256=yC3kL2MQv3dzc2oNXiMgAsSVJUU292omzQ6TA6Z8Bog,7282
 flowtracks/stitching.py,sha256=OmM_skhPLMNYstou5FIT5a58_gCZFNDQ_5s-EWg8KN0,16815
 flowtracks/trajectory.py,sha256=jqWhkAP7m7_g9rHW7FjxurHRRMeUvg6Ast-uMrutHFk,11737
 flowtracks/vortex.py,sha256=TUJCHJn0_hYoeSyu5sHGXvpwV4DC_NovcelGdUf5h-4,2449
 flowtracks/wall_shear.py,sha256=kaaVVmiomlbwITDE-7Mxi4t5Zme-8uiJKK9RRoBChjM,6708
 flowtracks/writers.py,sha256=p0o14FBxl0rjImlYXaaojg7E9UbBkfb2lt85IDmMJ_s,8311
 flowtracks/zarr_scene.py,sha256=WWcV3BvvXsgFrcS0Bv0zlDjx5yltrvL0WZeVofcmVOM,10388
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/batch_Lagrangian_to_Eulerian.py,sha256=e7mQFqyqvCeAHRKiN1IaxdNJi0e2FU84c7QNrx0L-m0,2296
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/hdf5_scene_analysis.ipynb,sha256=jn0Z_ZVL1-iXaiKXwyAeb74NbXsBpnocCxCSDh814eU,243097
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/linking_trajectories.ipynb,sha256=udz0GLDiPv68BYySg4yO1HWzaB9Sdy3YA3IhnIHDeII,8820
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_dual_rig_trajectories.py,sha256=dzeK0C-knwq1bPOwo0p1RhWrb0RPp-T31rBaGEptXcc,6737
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_flowtracks.py,sha256=7FIJNwBx9aBRmaM5ofmYTXSWEjE0wZqDfs8J47Tmw6U,9440
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_hdf5_vs_zarr_scene_analysis.py,sha256=bjXlMsLJTxJ0JkvGcVZbuDOFYZU4OvdabtDUgqb15So,4536
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_linking_trajectories_zarr.py,sha256=Ny_WUbiZWo0aKw-u2KGFWrhMv-8BvNgBy0UHIqCobYg,8210
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_phase_averaging_demo.py,sha256=vg6j2ayKGl-5uj08bdzzb6pujzJJQ_5bUsG7UuPP7dM,9270
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_phase_metrics.py,sha256=kBc2e_b-orDrm3AnuUXCcxsvmfQWyCtE826pFeolMGE,9367
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_vtk_writers_preview.py,sha256=Otrhhp-QFf6F94EOs6rWu5xOCpbS16EfWy_iMFp7e_I,14611
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/marimo_zarr_dashboard.py,sha256=jVIum6hdEelH4ef7vRgsfLhrbmMsuErsJBzxrnEImnw,9268
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/repeated_interpolation.ipynb,sha256=t9SfoIWRu5XP0SrphWbQy508uzyEibVz61FGjl51fjA,8861
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/run_pipeline.py,sha256=5fGE2tIP6XjFZ1sEYmqBujuLaXFfRL-rNnbr2p2CDfM,7205
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/visualize_marimo.py,sha256=jWrg5IWjY-bmSQwQjaO5qTr0t_G48CsqJYpevdQrxeY,13026
-flowtracks-1.5.2.dev1.data/data/flowtracks-examples/visualize_results.py,sha256=SbPg3EoDcuIyo0rUz3E-AnT4sLWDVJFhgC6xVcracW4,7583
-flowtracks-1.5.2.dev1.data/scripts/analyse_fhdf.py,sha256=QH08NdImGukTEGuZEKFxjStcSelXBv-8A-22G6KtXqM,1315
-flowtracks-1.5.2.dev1.dist-info/licenses/LICENSE.txt,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-flowtracks-1.5.2.dev1.dist-info/METADATA,sha256=W8r9Zc6lbLgaf4iolmQ7mj0Ou5-4_asdfs90_MyqnAc,44503
-flowtracks-1.5.2.dev1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-flowtracks-1.5.2.dev1.dist-info/top_level.txt,sha256=cR54RNb9y2Wfr_BfuOezmNJOMB4GfIHh1-luXTREnQA,11
-flowtracks-1.5.2.dev1.dist-info/RECORD,,
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/batch_Lagrangian_to_Eulerian.py,sha256=e7mQFqyqvCeAHRKiN1IaxdNJi0e2FU84c7QNrx0L-m0,2296
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/hdf5_scene_analysis.ipynb,sha256=jn0Z_ZVL1-iXaiKXwyAeb74NbXsBpnocCxCSDh814eU,243097
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/linking_trajectories.ipynb,sha256=udz0GLDiPv68BYySg4yO1HWzaB9Sdy3YA3IhnIHDeII,8820
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_dual_rig_trajectories.py,sha256=dzeK0C-knwq1bPOwo0p1RhWrb0RPp-T31rBaGEptXcc,6737
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_flowtracks.py,sha256=7FIJNwBx9aBRmaM5ofmYTXSWEjE0wZqDfs8J47Tmw6U,9440
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_hdf5_vs_zarr_scene_analysis.py,sha256=bjXlMsLJTxJ0JkvGcVZbuDOFYZU4OvdabtDUgqb15So,4536
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_linking_trajectories_zarr.py,sha256=Ny_WUbiZWo0aKw-u2KGFWrhMv-8BvNgBy0UHIqCobYg,8210
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_phase_averaging_demo.py,sha256=vg6j2ayKGl-5uj08bdzzb6pujzJJQ_5bUsG7UuPP7dM,9270
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_phase_metrics.py,sha256=kBc2e_b-orDrm3AnuUXCcxsvmfQWyCtE826pFeolMGE,9367
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_vtk_writers_preview.py,sha256=Otrhhp-QFf6F94EOs6rWu5xOCpbS16EfWy_iMFp7e_I,14611
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/marimo_zarr_dashboard.py,sha256=jVIum6hdEelH4ef7vRgsfLhrbmMsuErsJBzxrnEImnw,9268
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/repeated_interpolation.ipynb,sha256=t9SfoIWRu5XP0SrphWbQy508uzyEibVz61FGjl51fjA,8861
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/run_pipeline.py,sha256=5fGE2tIP6XjFZ1sEYmqBujuLaXFfRL-rNnbr2p2CDfM,7205
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/visualize_marimo.py,sha256=jWrg5IWjY-bmSQwQjaO5qTr0t_G48CsqJYpevdQrxeY,13026
+flowtracks-1.5.2.dev2.data/data/flowtracks-examples/visualize_results.py,sha256=SbPg3EoDcuIyo0rUz3E-AnT4sLWDVJFhgC6xVcracW4,7583
+flowtracks-1.5.2.dev2.data/scripts/analyse_fhdf.py,sha256=QH08NdImGukTEGuZEKFxjStcSelXBv-8A-22G6KtXqM,1315
+flowtracks-1.5.2.dev2.dist-info/licenses/LICENSE.txt,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+flowtracks-1.5.2.dev2.dist-info/METADATA,sha256=MlE4mJ4k3Y0IDvU6_FHN1towDDBGIM9BgWcYy7h21Ag,44503
+flowtracks-1.5.2.dev2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+flowtracks-1.5.2.dev2.dist-info/top_level.txt,sha256=cR54RNb9y2Wfr_BfuOezmNJOMB4GfIHh1-luXTREnQA,11
+flowtracks-1.5.2.dev2.dist-info/RECORD,,