Changeset 911 for trunk/src/series/civ_series.m

Timestamp:

Jun 15, 2015, 10:45:43 PM (9 years ago)

Author:

sommeria

Message:

bug repaired in civ_series (mask problem) and clarification of output for OAR in series

File:

• trunk/src/series/civ_series.m (modified) (4 diffs)

trunk/src/series/civ_series.m

@@ -1093 +1093 @@
                         xtable(ivec)=iref+utable(ivec)/2-0.5;% convec flow (velocity taken at the point middle from imgae 1 and 2)
                         ytable(ivec)=jref+vtable(ivec)/2-0.5;% and position of pixel 1=0.5 (convention for image coordinates=0 at the edge)
-                        iref=round(xtable(ivec));% nearest image index for the middle of the vector
-                        jref=round(ytable(ivec));
+                        iref=round(xtable(ivec)+0.5);% nearest image index for the middle of the vector
+                        jref=round(ytable(ivec)+0.5);
                         % eliminate vectors located in the mask
-                        if checkmask && par_civ.Mask(jref,iref)<200 && par_civ.Mask(jref,iref)>=100
+                        if  checkmask && (iref<1 || jref<1 ||iref>npx_ima || jref>npy_ima ||( par_civ.Mask(jref,iref)<200 && par_civ.Mask(jref,iref)>=100))
                             utable(ivec)=0;
                             vtable(ivec)=0;
@@ -1129 +1129 @@
 F=0;
 [npy,npx]=size(result_conv);
-result_conv(result_conv<1)=1; %set to 1 correlation values smaller than 1 (to avoid divergence in the log)
+result_conv(result_conv<1)=1; %set to 1 correlation values smaller than 1  (=0 by discretisation, to avoid divergence in the log)
 %the following 8 lines are copyright (c) 1998, Uri Shavit, Roi Gurka, Alex Liberzon, Technion ￜ Israel Institute of Technology
 %http://urapiv.wordpress.com
 peaky = y;
-if y <= npy-1 && y > 1
+if y < npy && y > 1
     f0 = log(result_conv(y,x));
     f1 = log(result_conv(y-1,x));
@@ -1142 +1142 @@
 end
 peakx=x;
-if x <= npx-1 && x > 1
+if x < npx-1 && x > 1
     f0 = log(result_conv(y,x));
     f1 = log(result_conv(y,x-1));
@@ -1162 +1162 @@
 result_conv(result_conv<1)=1; %set to 1 correlation values smaller than 1 (to avoid divergence in the log)
 [npy,npx]=size(result_conv);
-if (x <= npx-1) && (y <= npy-1) && (x >= 1) && (y >= 1)
+if (x < npx) && (y < npy) && (x > 1) && (y > 1)
     F=0;
     for i=-1:1