Changeset 248 for trunk/src/pivlab.m

Timestamp:

May 9, 2011, 12:32:20 AM (13 years ago)

Author:

sommeria

Message:

various modifications

File:

• trunk/src/pivlab.m (modified) (2 diffs)

trunk/src/pivlab.m

@@ -42 +42 @@
 %% mask
 testmask=0;
+image1=double(image1);
+image2=double(image2);
 if exist('mask','var') && ~isempty(mask)
    testmask=1;
@@ -54 +56 @@
     %  100>=mask> 20: velocity not calculated, impermeable (no flux through mask boundaries)
     %  20>=mask: velocity=0
-    test_noflux=(mask<=100) ;
-    test_undefined=(mask<=200 & mask>100 );
-    image1(test_undefined)=min(min(image1))*ones(size(image1));% put image to zero in the undefined  area
-    image2(test_undefined)=min(min(image1))*ones(size(image1));% put image to zero in the undefined  area
+    test_noflux=(mask<100) ;
+    test_undefined=(mask<200 & mask>=100 );
+    image1(test_undefined)=min(min(image1));% put image to zero in the undefined  area
+    image2(test_undefined)=min(min(image2));% put image to zero in the undefined  area
 end
-image1=double(image1);
-image2=double(image2);
 
 %% calculate correlations: MAINLOOP