Changeset 776

Timestamp:

May 17, 2014, 8:10:32 AM (11 years ago)

Author:

sommeria

Message:

 

Location:

trunk/src

Files:

• series.m (modified) (2 diffs)
• series/civ_input.m (modified) (5 diffs)

trunk/src/series.m

@@ -1768 +1768 @@
             end
         end
-        max_walltime=3600*12; % 12h max total calculation 
+        max_walltime=3600*24; % 24h max total calculation 
         walltime_onejob=600;%seconds, max estimated time for asingle file index value
         filename_joblist=fullfile(DirOAR,'job_list.txt');%create name of the global executable file
@@ -2366 +2366 @@
     end
 else
-    if ~isempty(TimeName)
+    if ~isempty(TimeName)&& isfield(Data,TimeName)
         TimeValue=Data.(TimeName);
     end

trunk/src/series/civ_input.m

@@ -160 +160 @@
 
 %% display the min and max indices for the whole file series
-if size(SeriesData.i1_series{iview_image},2)==2 && min(min(SeriesData.i1_series{iview_image}(:,1,:)))==0
-    MinIndex_j=1;% index j set to 1 by default
-    MaxIndex_j=1;
-    MinIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:), 1 )-1;% min ref index i detected in the series (corresponding to the first non-zero value of i1_series, except for zero index) 
-    MaxIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:),1,'last' )-1;%max ref index i detected in the series (corresponding to the last non-zero value of i1_series) 
-else
-    ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
-    ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
-     MinIndex_i=min(find(ref_i))-1;
-     MaxIndex_i=max(find(ref_i))-1;
-     MaxIndex_j=max(find(ref_j))-1;
-     MinIndex_j=min(find(ref_j))-1;
-end
-% MaxIndex_i=Param.IndexRange.MaxIndex_i(iview_image);
-% MinIndex_i=Param.IndexRange.MinIndex_i(iview_image);
-% MaxIndex_j=1;%default
-% MinIndex_j=1;
-% if isfield(Param.IndexRange,'MaxIndex_j')&&isfield(Param.IndexRange,'MinIndex_j')...
-%         && numel(Param.IndexRange.MaxIndex_j')>=iview_image &&numel(Param.IndexRange.MinIndex_j')>=iview_image
-%     MaxIndex_j=Param.IndexRange.MaxIndex_j(iview_image);
-%     MinIndex_j=Param.IndexRange.MinIndex_j(iview_image);
-% end
-CivInputData.MaxIndex_i=MaxIndex_i;
-CivInputData.MaxIndex_j=MaxIndex_j;
-CivInputData.MinIndex_i=MinIndex_i;
-CivInputData.MinIndex_j=MinIndex_j;
+MaxIndex_i=Param.IndexRange.MaxIndex_i(iview_image);
+MinIndex_i=Param.IndexRange.MinIndex_i(iview_image);
+MaxIndex_j=1;%default
+MinIndex_j=1;
+if isfield(Param.IndexRange,'MaxIndex_j')&&isfield(Param.IndexRange,'MinIndex_j')...
+        && numel(Param.IndexRange.MaxIndex_j')>=iview_image &&numel(Param.IndexRange.MinIndex_j')>=iview_image
+    MaxIndex_j=Param.IndexRange.MaxIndex_j(iview_image);
+    MinIndex_j=Param.IndexRange.MinIndex_j(iview_image);
+end
+%update the bounds if possible
+if isfield(SeriesData,'i1_series')&&numel(SeriesData.i1_series)>=iview_image
+    if size(SeriesData.i1_series{iview_image},2)==2 && min(min(SeriesData.i1_series{iview_image}(:,1,:)))==0
+        MinIndex_j=1;% index j set to 1 by default
+        MaxIndex_j=1;
+        MinIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:), 1 )-1;% min ref index i detected in the series (corresponding to the first non-zero value of i1_series, except for zero index)
+        MaxIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:),1,'last' )-1;%max ref index i detected in the series (corresponding to the last non-zero value of i1_series)
+    else
+        ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
+        ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
+        MinIndex_i=min(find(ref_i))-1;
+        MaxIndex_i=max(find(ref_i))-1;
+        MaxIndex_j=max(find(ref_j))-1;
+        MinIndex_j=min(find(ref_j))-1;
+    end
+end
+% CivInputData.MaxIndex_i=MaxIndex_i;
+% CivInputData.MaxIndex_j=MaxIndex_j;
+% CivInputData.MinIndex_i=MinIndex_i;
+% CivInputData.MinIndex_j=MinIndex_j;
 if ~isfield(Param.IndexRange,'first_j')||isequal(MaxIndex_j,MinIndex_j)% no possibility of j pairs
     set(handles.ListPairMode,'Value',1)
@@ -250 +253 @@
 set(handles.CoordUnit,'String',CoordUnit)
 set(handles.SearchRange,'UserData', pxcm_search);
-% indicate the min and max indices i and j on the GUI
-set(handles.MinIndex_i,'String',num2str(MinIndex_i))
-set(handles.MaxIndex_i,'String',num2str(MaxIndex_i))
-set(handles.MinIndex_j,'String',num2str(MinIndex_j))
-set(handles.MaxIndex_j,'String',num2str(MaxIndex_j))
 
 %% introduce the stored Civ parameters  if available (from previous input or ImportConfig in series)
@@ -275 +273 @@
     end
 end
+% indicate the min and max indices i and j on the GUI
+set(handles.MinIndex_i,'String',num2str(MinIndex_i))
+set(handles.MaxIndex_i,'String',num2str(MaxIndex_i))
+set(handles.MinIndex_j,'String',num2str(MinIndex_j))
+set(handles.MaxIndex_j,'String',num2str(MaxIndex_j))
 
 %% set the civ_input options, depending on the input file content if a nc file has been opened
@@ -925 +928 @@
         end
     case 'pair j1-j2'%case of pairs
-        MinIndex_j=CivInputData.MinIndex_j;
-        MaxIndex_j=min(CivInputData.MaxIndex_j,10);%limitate the number of pairs to 10x10
+%         MinIndex_j=CivInputData.MinIndex_j;
+%         MaxIndex_j=min(CivInputData.MaxIndex_j,10);%limitate the number of pairs to 10x10
+        MinIndex_j=str2num(get(handles.MinIndex_j,'String'));
+        MaxIndex_j=str2num(get(handles.MaxIndex_j,'String'));
         index_pair=0;
         %get all the Time intervals in bursts
@@ -1004 +1009 @@
 ref_i_Callback(hObject, eventdata, handles)%refresh dispaly of dt for pairs (in case of non constant dt)
 
-%------------------------------------------------------------------------
-function MinIndex_j_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-first_j=str2num(get(handles.MinIndex_j,'String'));
-set(handles.ref_j,'String', num2str(first_j))% reference index for pair dt = first index
-ref_j_Callback(hObject, eventdata, handles)%refresh dispaly of dt for pairs (in case of non constant dt)
+% %------------------------------------------------------------------------
+% function MinIndex_j_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+% first_j=str2num(get(handles.MinIndex_j,'String'));
+% set(handles.ref_j,'String', num2str(first_j))% reference index for pair dt = first index
+% ref_j_Callback(hObject, eventdata, handles)%refresh dispaly of dt for pairs (in case of non constant dt)
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%