Merge commit '18564cfe5545abbc1386e6fe6b77c5fe06798467'

Author: alexlib

openpiv/test/test_windef.py

@@ -134,7 +134,7 @@ def test_multi_pass_lin():
     assert np.mean(np.abs(v_old - shift_v)) < threshold
 
     for i in range(1, iterations):
-        x, y, u, v, sn = windef.multipass_img_deform(
+        x, y, u, v, _ = windef.multipass_img_deform(
             frame_a,
             frame_b,
             window_size[i],

openpiv/windef.py

@@ -638,19 +638,19 @@ def multipass_img_deform(
         u_pre = np.ma.masked_array(u_pre, mask=mask)
         v_pre = np.ma.masked_array(v_pre, mask=mask)
 
-    if settings.show_plot:
-        plt.figure()
-        plt.quiver(x_old, y_old, u_old, v_old,color='b')
-        plt.quiver(x_int, y_int, u_pre, v_pre,color='r')
-        plt.gca().invert_yaxis()
-        plt.gca().set_aspect(1.)
+    # if settings.show_plot:
+    #     plt.figure()
+    #     plt.quiver(x_old, y_old, u_old, v_old,color='b')
+    #     plt.quiver(x_int, y_int, u_pre, v_pre,color='r')
+    #     plt.gca().invert_yaxis()
+    #     plt.gca().set_aspect(1.)
 
     # @TKauefer added another method to the windowdeformation, 'symmetric' 
     # splits the onto both frames, takes more effort due to additional 
     # interpolation however should deliver better results
 
-    old_frame_a = frame_a.copy()
-    old_frame_b = frame_b.copy()
+    # old_frame_a = frame_a.copy()
+    # old_frame_b = frame_b.copy()
 
     if deformation_method == "symmetric":
         # this one is doing the image deformation (see above)
@@ -669,11 +669,11 @@ def multipass_img_deform(
     else:
         raise Exception("Deformation method is not valid.")
 
-    if settings.show_plot:
-        plt.figure()
-        plt.imshow(frame_a-old_frame_a)
-        plt.figure()
-        plt.imshow(frame_b-old_frame_b)
+    # if settings.show_plot:
+    #     plt.figure()
+    #     plt.imshow(frame_a-old_frame_a)
+    #     plt.figure()
+    #     plt.imshow(frame_b-old_frame_b)
 
     if (
         do_sig2noise is True and  # and also the last one is optional? 
@@ -718,12 +718,12 @@ def multipass_img_deform(
         u = np.ma.masked_array(u, mask=mask)
         v = np.ma.masked_array(v, mask=mask)
 
-    if settings.show_plot:
-        plt.figure()
-        plt.quiver(x_int, y_int, u, v,color='r')
-        plt.quiver(x_int, y_int, u_pre, v_pre,color='b')
-        plt.gca().invert_yaxis()
-        plt.gca().set_aspect(1)
+    # if settings.show_plot:
+    #     plt.figure()
+    #     plt.quiver(x_int, y_int, u, v,color='r')
+    #     plt.quiver(x_int, y_int, u_pre, v_pre,color='b')
+    #     plt.gca().invert_yaxis()
+    #     plt.gca().set_aspect(1)
 
     return x, y, u, v, s2n