Skip to content

Commit dd493b2

Browse files
committed
removed obsolete windows input from simplepass, settings is what's delivered now
1 parent 7cf7f2b commit dd493b2

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

openpiv/test/test_windef.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def test_simple_rectangular_window():
273273
settings.subpixel_method = 'gaussian'
274274
settings.sig2noise_mask = 2
275275

276-
x, y, u, v, flags = windef.simple_multipass(
276+
x, y, _,_,_ = windef.simple_multipass(
277277
frame_a,
278278
frame_b,
279279
settings,
@@ -290,7 +290,7 @@ def test_simple_rectangular_window():
290290
settings.overlap = ((16, 32), (8, 16))
291291
settings.num_iterations = 2
292292

293-
x, y, u, v, flags = windef.simple_multipass(
293+
x, y, _, _, _ = windef.simple_multipass(
294294
frame_a,
295295
frame_b,
296296
settings,

openpiv/windef.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -973,19 +973,21 @@ def simple_multipass(
973973
frame_a: np.ndarray,
974974
frame_b: np.ndarray,
975975
settings: Optional["PIVSettings"]=None,
976-
windows: Optional[Tuple[int, ...]]=None,
977976
)->Tuple:
978-
""" Simple windows deformation multipass run with
979-
default settings
980-
"""
977+
"""_summary_
978+
979+
Args:
980+
frame_a (np.ndarray): frame A image as an array
981+
frame_b (np.ndarray): frame B,
982+
settings (Optional["PIVSettings"], optional): _description_. Defaults to None.
981983
984+
Returns:
985+
Tuple: _description_
986+
"""
982987
if settings is None:
983988
settings = PIVSettings()
984-
985-
if windows is not None:
986-
settings.num_iterations = len(windows)
987-
settings.windowsizes = windows
988-
settings.overlap = tuple(int(w/2) for w in windows)
989+
settings.windowsizes = (64, 32)
990+
settings.overlap = (32, 16)
989991

990992
x, y, u, v, s2n = first_pass(
991993
frame_a,

0 commit comments

Comments
 (0)