Changeset 1199 for trunk/src/civ.m

Timestamp:

Mar 18, 2026, 12:44:56 PM (3 hours ago)

Author:

sommeria

Message:

bugs repaired

File:

• trunk/src/civ.m (modified) (4 diffs)

trunk/src/civ.m

@@ -67 +67 @@
 shiftx=par_civ.SearchBoxShift(:,1);%use the input shift estimate, rounded to the next integer value
 shifty=par_civ.SearchBoxShift(:,2);% 
-if numel(shiftx)==1% case of a unique shift for the whole field( civ1)
+if isscalar(shiftx)% case of a unique shift for the whole field( civ1)
     shiftx=shiftx*ones(nbvec,1);
     shifty=shifty*ones(nbvec,1);
@@ -106 +106 @@
 %  100>=mask> 20: velocity not calculated, impermeable (no flux through mask boundaries)
 %  20>=mask: velocity=0
-checkmask=0;
+checkmask=false;
+check_undefined=zeros(npy_ima, npx_ima);
 MinA=min(min(par_civ.ImageA));
 if isfield(par_civ,'Mask') && ~isempty(par_civ.Mask)
-    checkmask=1;
+    checkmask=true;
     if ~isequal(size(par_civ.Mask),[npy_ima npx_ima])
         errormsg='mask must be an image with the same size as the images';
@@ -125 +126 @@
     par_civ.CorrSmooth=2;% use SUBPIX2DGAUSS (take into account more points near the max)
 end
-
+SearchRange_1=par_civ.SearchRange(1);
+SearchRange_2=par_civ.SearchRange(2);
 if par_civ.CorrSmooth~=0 % par_civ.CorrSmooth=0 implies no civ computation (just input image and grid points given)
     parfor ivec=1:nbvec
@@ -136 +138 @@
         ibx2=floor(CorrBoxSizeX(ivec)/2);
         iby2=floor(CorrBoxSizeY(ivec)/2);
-        isx2=ibx2+ceil(par_civ.SearchRange(1));
-        isy2=iby2+ceil(par_civ.SearchRange(2));
+        isx2=ibx2+ceil(SearchRange_1);
+        isy2=iby2+ceil(SearchRange_2);
         subrange1_x=iref-ibx2:iref+ibx2;% x indices defining the first subimage
         subrange1_y=jref-iby2:jref+iby2;% y indices defining the first subimage