Changeset 904 for trunk/src/series

Timestamp:

May 30, 2015, 1:26:33 PM (9 years ago)

Author:

sommeria

Message:

walltime estimate introduced in series, and option of result file overwrite

Location:

trunk/src/series

Files:

• civ_series.m (modified) (4 diffs)
• ima_levels.m (modified) (2 diffs)
• sub_background.m (modified) (2 diffs)

trunk/src/series/civ_series.m

@@ -70 +70 @@
     Data.OutputSubDirMode='last'; %select the last subDir in the input table as root of the output subdir name (option 'all'/'first'/'last', 'all' by default)
     Data.OutputFileMode='NbInput_i';% one output file expected per value of i index (used for waitbar)
+    Data.CheckOverwriteVisible='on'; % manage the overwrite of existing files (default=1)
     return
 end
@@ -325 +326 @@
 maskname='';% initiate the mask name
 tic;
+CheckOverwrite=1;%default
+if isfield(Param,'CheckOverwrite')
+    CheckOverwrite=Param.CheckOverwrite;
+end
 for ifield=1:NbField
     if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
@@ -350 +355 @@
                     j1_series_Civ1(ifield),j2_series_Civ1(ifield));
             end
+        end
+        if ~CheckOverwrite && exist(ncfile,'file')          
+        continue% skip iteration if the mode overwrite is desactivated and the result file already exists
         end
     end
@@ -861 +869 @@
             disp(errormsg)
         end
-        disp(['ellapsed time ' num2str(toc) ' s'])
+        disp(['ellapsed time ' num2str(toc/60,2) ' minutes'])
     end
 end

trunk/src/series/ima_levels.m

@@ -95 +95 @@
 %% read input parameters from an xml file if input is a file name (batch mode)
 ParamOut=[];
+RUNHandle=[];
+WaitbarHandle=[];
 checkrun=1;
 if ischar(Param)
     Param=xml2struct(Param);% read Param as input file (batch case)
     checkrun=0;
-end
-hseries=findobj(allchild(0),'Tag','series');
-RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
-WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
+else% interactive mode in Matlab
+    hseries=findobj(allchild(0),'Tag','series');
+    RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
+    WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
+end
 
 %% subdirectory for output files
@@ -171 +174 @@
 for ifile=1:nbfield
             update_waitbar(WaitbarHandle,ifile/nbfield)
-    if ~isempty(RUNHandle)&& ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         return

trunk/src/series/sub_background.m

@@ -189 +189 @@
 %% read input parameters from an xml file if input is a file name (batch mode)
 checkrun=1;
+RUNHandle=[];
+WaitbarHandle=[];
 if ischar(Param)
     Param=xml2struct(Param);% read Param as input file (batch case)
     checkrun=0;
-end
+else
 hseries=findobj(allchild(0),'Tag','series');
 RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
 WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
+end
 
 %% input preparation
@@ -352 +355 @@
         for ifield = step*(halfnbaver+1):step:nbfield_series-step*(halfnbaver+1)% ifield +iburst=index of the current processed image
             update_waitbar(WaitbarHandle,ifield/nbfield_series)
-            if  ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+            if  ~isempty(RUNHandle)&&~strcmp(get(RUNHandle,'BusyAction'),'queue')
                 disp('program stopped by user')
                 return