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

Timestamp:

May 23, 2015, 5:09:49 PM (9 years ago)

Author:

sommeria

Message:

bug corrected in civ_series/patch

File:

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

trunk/src/series/civ_series.m

@@ -328 +328 @@
     if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
         update_waitbar(WaitbarHandle,ifield/NbField)
-        if  get(RUNHandle,'Value')&& ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+        if  ~strcmp(get(RUNHandle,'BusyAction'),'queue')
             disp('program stopped by user')
             break
@@ -355 +355 @@
     % if Civ1 computation is requested
     if isfield (Param.ActionInput,'Civ1')
+        disp('civ1 started')
         par_civ1=Param.ActionInput.Civ1;
         if CheckInputFile % read input images (except in mode Test where it is introduced directly in Param.ActionInput.Civ1.ImageNameA and B)
@@ -496 +497 @@
     %% Fix1
     if isfield (Param.ActionInput,'Fix1')
+         disp('fix1 started')
         if ~isfield (Param.ActionInput,'Civ1')% if we use existing Civ1, remove previous data beyond Civ1
             Fix1_attr=find(strcmp('Fix1',Data.ListGlobalAttribute));
@@ -519 +521 @@
     %% Patch1
     if isfield (Param.ActionInput,'Patch1')
+        disp('patch1 started')
         if check_civx
             errormsg='Civ Matlab input needed for patch';
@@ -559 +562 @@
         Data.Civ1_V_smooth(ind_good)=Vres;
         Data.Civ1_FF(ind_good)=FFres;
+        disp('patch1 performed')
     end
     
     %% Civ2
     if isfield (Param.ActionInput,'Civ2')
+        disp('civ2 started')
         par_civ2=Param.ActionInput.Civ2;
         if CheckInputFile % read input images (except in mode Test where it is introduced directly in Param.ActionInput.Civ1.ImageNameA and B)
@@ -751 +756 @@
         Data.Civ2_C=reshape(ctable,[],1);
         Data.Civ2_F=reshape(F,[],1);
+        disp('civ2 performed')
     elseif ~isfield(Data,'ListVarName') % we start there, using existing Civ2 data
         if exist('ncfile','var')
@@ -773 +779 @@
     %% Fix2
     if isfield (Param.ActionInput,'Fix2')
+        disp('fix2 started')
         list_param=fieldnames(Param.ActionInput.Fix2)';
         Fix2_param=regexprep(list_param,'^.+','Fix2_$0');% insert 'Fix1_' before  each string in ListFixParam
@@ -804 +811 @@
             Data.CivStage=Data.CivStage+1;
         end
-        
     end
     
     %% Patch2
     if isfield (Param.ActionInput,'Patch2')
+        disp('patch2 started')
         list_param=fieldnames(Param.ActionInput.Patch2)';
         list_param(strcmp('TestPatch2',list_param))=[];% remove the parameter TestCiv1 from the list
@@ -841 +848 @@
         Data.Civ2_FF(ind_good)=FFres;
         Data.CivStage=Data.CivStage+1;
+        disp('patch2 performed')
     end