Changeset 1070 for trunk/src/series.m

Timestamp:

Jul 11, 2019, 7:02:27 PM (5 years ago)

Author:

sommeria

Message:

browse_data improved

File:

• trunk/src/series.m (modified) (7 diffs)

trunk/src/series.m

@@ -612 +612 @@
 function REFRESH_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+check_input_file_series(handles)
+
+%% enable field and veltype menus, in accordance with the current action
+ActionInput_Callback([],[], handles)
+
+
+function check_input_file_series(handles)
 InputTable=get(handles.InputTable,'Data');
 set(handles.series,'Pointer','watch') % set the mouse pointer to 'watch'
@@ -676 +683 @@
 set(handles.series,'Pointer','arrow') % set the mouse pointer to 'watch'
 
-%% enable field and veltype menus, in accordance with the current action
-ActionInput_Callback([],[], handles)
 
 
@@ -1661 +1666 @@
         Param.InputTable(:,1)=ListPath(:,iexp);
         Param.InputTable(:,2)=ListSubdir(:,iexp);
-        if size(Param.InputTable,1)==1% case of single input line
-        Param.OutputSubDir=ListSubdir{iexp};
-        end
-        set(handles.InputTable,'Data',Param.InputTable)
-%         set(handles.OutputSubDir,'String',ListSubdir{iexp})
+        OutputSubDir=unique(ListSubdir(:,iexp));
+        Param.OutputSubDir=OutputSubDir{1};
+        if numel(OutputSubDir)>1% case 
+            for iout=2:numel(OutputSubDir)
+                Param.OutputSubDir=[Param.OutputSubDir '-' OutputSubDir{iout}];
+            end               
+        end       
     end
     [xx,ExpName]=fileparts(Param.InputTable{1,1});
     Param.IndexRange.first_i=str2num(get(handles.num_first_i,'String'));%reset the firrst_i and last_i for multiple experiments, modified by the splitting into NbProcess
     Param.IndexRange.last_i=str2num(get(handles.num_last_i,'String'));
-    %% create the output data directory if needed
+    
+    %% create the output data directory if needed, after chcking its existence
     OutputDir='';
     answer='';
     if isfield(Param,'OutputSubDir')% possibly update the output dir if it already exists
-        SubDirOut=[get(handles.OutputSubDir,'String') Param.OutputDirExt];
+        SubDirOut=[Param.OutputSubDir Param.OutputDirExt];
         SubDirOutNew=SubDirOut;
         detect=exist(fullfile(Param.InputTable{1,1},SubDirOutNew),'dir'); % test if  the dir  already exist
@@ -1708 +1716 @@
             continue
         end
-        Param.OutputDirExt=regexprep(SubDirOutNew,Param.OutputSubDir,'');
+        Param.OutputDirExt=regexprep(SubDirOutNew,['^' Param.OutputSubDir],'');
         Param.OutputRootFile=Param.InputTable{1,3}; % the first sorted RootFile taken for output
-        set(handles.OutputDirExt,'String',Param.OutputDirExt)
-        OutputDir=fullfile(Param.InputTable{1,1},[Param.OutputSubDir Param.OutputDirExt]) % full name (with path) of output directory
+        OutputDir=fullfile(Param.InputTable{1,1},[Param.OutputSubDir Param.OutputDirExt]); % full name (with path) of output directory
         if check_create    % create output directory if it does not exist
             [tild,msg1]=mkdir(OutputDir);
@@ -1722 +1729 @@
     elseif isfield(Param,'ActionInput')&&isfield(Param.ActionInput,'LogPath')% custom definition of the output dir
         OutputDir=Param.ActionInput.LogPath;
+    end
+    
+    set(handles.OutputSubDir,'String',Param.OutputSubDir)
+    set(handles.OutputDirExt,'String',Param.OutputDirExt)
+    drawnow
+    if get(handles.Replicate,'Value')
+        set(handles.InputTable,'Data',Param.InputTable)
+        check_input_file_series(handles)
     end
     DirXml=fullfile(OutputDir,'0_XML');
@@ -2209 +2224 @@
 end
 set(handles.Replicate,'BackgroundColor',[0 1 0])
-if NbExp>1
-    set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta (input file features need to be updated)
-end
+
 %------------------------------------------------------------------------
 function STOP_Callback(hObject, eventdata, handles)
@@ -3816 +3829 @@
 % --- Executes on button press in MonitorCluster.
 function MonitorCluster_Callback(hObject, eventdata, handles)
-disp('format: R/W=run/wait, time lapsed, R=nbre of cores,W=walltime')
-system('oarstat |grep N=UVmat')% check the list of jobs launched with uvmat
+
+[rr,ss]=system('oarstat |grep N=UVmat');% check the list of jobs launched with uvmat
+if isempty(ss)
+   disp( 'no job presently submitted with uvmat')
+else
+    disp('format: R/W=run/wait, time lapsed, R=nbre of cores,W=walltime')
+    disp(ss)
+end