Changeset 365 for trunk/src

Timestamp:

Jan 10, 2012, 8:09:44 PM (13 years ago)

Author:

sommeria

Message:

bugs fixed in civ_uvmat and find_file_series (to deal with letter indices)

Location:

trunk/src

Files:

• civ_matlab.m (modified) (4 diffs)
• find_file_series.m (modified) (1 diff)

trunk/src/civ_matlab.m

@@ -205 +205 @@
     ibx2=ceil(par_civ2.Bx/2);
     iby2=ceil(par_civ2.By/2);
-    isx2=ibx2+2;
-    isy2=iby2+2;
+    isx2=ibx2+3;
+    isy2=iby2+3;
     % shift from par_civ2.filename_nc1
     % shiftx=velocity interpolated at position
@@ -250 +250 @@
     par_civ2.Searchx=2*isx2+1;
     par_civ2.Searchy=2*isy2+1;
-    par_civ2.Shiftx=Shiftx./nbval;
-    par_civ2.Shifty=Shifty./nbval;
-    par_civ2.Grid=[GridX GridY];   
+    par_civ2.Shiftx=Shiftx(nbval>=1)./nbval(nbval>=1);
+    par_civ2.Shifty=Shifty(nbval>=1)./nbval(nbval>=1);
+    par_civ2.Grid=[GridX(nbval>=1) GridY(nbval>=1)];   
     if par_civ2.CheckDeformation
         DUDX=DUDX./nbval;
@@ -390 +390 @@
 isx2=ceil(par_civ.Searchx/2);
 isy2=ceil(par_civ.Searchy/2);
-shiftx=par_civ.Shiftx;
-shifty=-par_civ.Shifty;% sign minus because image j index increases when y decreases
+shiftx=round(par_civ.Shiftx);
+shifty=-round(par_civ.Shifty);% sign minus because image j index increases when y decreases
 if isfield(par_civ,'Grid')
     if ischar(par_civ.Grid)%read the drid file if the input is a file name
@@ -412 +412 @@
 nbvec=size(par_civ.Grid,1);
 if numel(shiftx)==1
-    shiftx=round(shiftx)*ones(nbvec,1);
-    shifty=round(shifty)*ones(nbvec,1);
+    shiftx=shiftx*ones(nbvec,1);
+    shifty=shifty*ones(nbvec,1);
 end
 %% Default output

trunk/src/find_file_series.m

@@ -145 +145 @@
             j1_star='*';
             if ~isempty(regexp(NomTypeStr,'[b|B]$'));
-                j2_str='(?<j1>[a-z]|[A-Z])';
+                j2_str='(?<j2>[a-z]|[A-Z])';
                 j2_star='*';
             end