Changeset 1062 for trunk/src/series

Timestamp:

Mar 21, 2019, 6:35:43 PM (6 years ago)

Author:

sommeria

Message:

bugs repaired, still problems with geometry_calib

Location:

trunk/src/series

Files:

• civ_series.m (modified) (3 diffs)
• merge_proj.m (modified) (1 diff)

trunk/src/series/civ_series.m

@@ -455 +455 @@
                 par_civ1.Mask=mask; %use mask already opened
             else
-                try
-                    par_civ1.Mask=imread(maskname);%update the mask, an store it for future use
-                catch ME
-                    if ~isempty(ME.message)
-                        errormsg=['error reading input image: ' ME.message];
-                        disp_uvmat('ERROR',errormsg,checkrun)
-                        return
+                if exist(maskname,'file')
+                    try
+                        par_civ1.Mask=imread(maskname);%update the mask, an store it for future use
+                    catch ME
+                        if ~isempty(ME.message)
+                            errormsg=['error reading input image: ' ME.message];
+                            disp_uvmat('ERROR',errormsg,checkrun)
+                            return
+                        end
                     end
+                else
+                    par_civ1.Mask=[];
                 end
                 mask=par_civ1.Mask;
@@ -711 +715 @@
                 par_civ2.Mask=mask; %use mask already opened
             else
+                if exist(maskname,'file')
                 try
                     par_civ2.Mask=imread(maskname);%update the mask, an store it for future use
@@ -719 +724 @@
                         return
                     end
+                end
+                else
+                    par_civ2.Mask=[];
                 end
                 mask=par_civ2.Mask;

trunk/src/series/merge_proj.m

@@ -288 +288 @@
         %% reading input file(s)      
         [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},ParamIn{iview},frame_index{iview}(index));
-        if ~isempty(errormsg)
+        if isempty(errormsg)
+            disp([filecell{iview,index} ' read'])
+        else
             disp_uvmat('ERROR',['ERROR in merge_proj/read_field/' errormsg],checkrun)
             return