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

Timestamp:

Jan 21, 2015, 7:02:04 PM (9 years ago)

Author:

sommeria

Message:

bugrepair

File:

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

trunk/src/series/civ_series.m

@@ -611 +611 @@
         
          % get the guess from patch1 or patch2 (case 'iterate')
-        if isfield (par_civ2,'iterate') && strcmp(par_civ2.iterate,'iterate')
+        if isfield (par_civ2,'iterate') && strcmp(par_civ2.iterate,'civ3')
            SubRange= Data.Civ2_SubRange;
            NbCentres=Data.Civ2_NbCentres;
@@ -1002 +1002 @@
                     [vector,F(ivec)] = SUBPIX2DGAUSS (result_conv,x,y);
                 end
-                utable(ivec)=vector(1)*mesh+shiftx(ivec);
+%                 if ~isfield(par_civ,'CheckDeformation')
+                utable(ivec)=vector(1)*mesh+shiftx(ivec); 
                 vtable(ivec)=vector(2)*mesh+shifty(ivec);
+%                 else
+%                                 utable(ivec)=shiftx(ivec);% TEST TEST !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+%                 vtable(ivec)=shifty(ivec);
+%                 end
                 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)