Changeset 910 for trunk/src/series

Timestamp:

Jun 13, 2015, 7:20:37 PM (9 years ago)

Author:

sommeria

Message:

bugs corrected in fix in civ_series. vectors set to 0 inside mask

Location:

trunk/src/series

Files:

• civ_input.m (modified) (2 diffs)
• civ_series.m (modified) (5 diffs)

trunk/src/series/civ_input.m

@@ -130 +130 @@
             return
         end
+        if isfield(Data,'.Civ1_ImageA')
         [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA);%look for the source image A
         [PathCiv1_ImageB,Civ1_ImageB,FileExtA]=fileparts(Data.Civ1_ImageB);%look for the source image B
+        end
         if isfield(Data,'Civ2_ImageA')
             [PathCiv2_ImageA,Civ2_ImageA,FileExtA]=fileparts(Data.Civ2_ImageA);
@@ -137 +139 @@
         end
         if size(Param.InputTable,1)==1
+             if isfield(Data,'.Civ1_ImageA')
             series('display_file_name',hhseries,Data.Civ1_ImageA,'append');%append the image series to the input list
-        end
-        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
+                    [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ1_ImageB);
+             else
+                 series('display_file_name',hhseries,Data.Civ2_ImageA,'append');%append the image series to the input list
+                         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ2_ImageA);
+        [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ2_ImageB);
+             end
+        end
+
         iview_image=2;%line # for the input images
     case 'civxdata'% case of  civx data,

trunk/src/series/civ_series.m

@@ -1024 +1024 @@
             if sizemask > 1/2% eliminate point if more than half of the correlation box is masked
                 F(ivec)=3; %
+                utable(ivec)=0;
+                vtable(ivec)=0;
             else
                 image1_crop=image1_crop.*~mask1_crop;% put to zero the masked pixels (mask1_crop='true'=1)
@@ -1042 +1044 @@
                 F(ivec)=3;
             end
-            if F(ivec)~=3
+            if F(ivec)==3
+                utable(ivec)=0;
+                vtable(ivec)=0;
+            else
                 %mask
                 if checkmask
@@ -1099 +1104 @@
                     catch ME
                         F(ivec)=3;
+                        disp(ME.message)
                     end
                 else
@@ -1127 +1133 @@
 %http://urapiv.wordpress.com
 peaky = y;
-if y <= npy-1 && y >= 1
+if y <= npy-1 && y > 1
     f0 = log(result_conv(y,x));
     f1 = log(result_conv(y-1,x));
@@ -1136 +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));