Changeset 537 for trunk/src/get_file_series.m

Timestamp:

Sep 3, 2012, 7:15:36 PM (12 years ago)

Author:

sommeria

Message:

various bugs fixed. Use of the free pair option '*-*' in series.

File:

• trunk/src/get_file_series.m (modified) (3 diffs)

trunk/src/get_file_series.m

@@ -41 +41 @@
         if isempty(r)
             r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');
-        end        
+        end
         % TODO case of free pairs:
         %r=regexp(pair_string,'.*\D(?<num1>[\d+|*])(?<delim>[-||])(?<num2>[\d+|*])','names');
@@ -48 +48 @@
         r(1).num1='';
         r(1).num2='';
+        if strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
+            r(1).mode='*-*';
+        else
         r(1).mode='';
+        end
     end
-    [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode);
+    if isequal(r(1).mode,'*-*')% free pairs
+        FilePath=fullfile(InputTable{iview,1},InputTable{iview,2});
+        fileinput=[InputTable{iview,3} InputTable{iview,4} InputTable{iview,5}];
+        [tild,tild,tild,i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview},NomType,FileType,MovieObject,i1_input,i2_input,j1_input,j2_input]=find_file_series(FilePath,fileinput);
+        i1_series{iview}=squeeze(i1_series{iview}(1,:,:)); %first  pair index
+        check_select=i1_series{iview}>=first_i & i1_series{iview}<=last_i;
+        i1_series{iview}=i1_series{iview}(check_select);    
+        i2_series{iview}=[]; %first  pair index
+        j1_series{iview}=squeeze(j1_series{iview}(1,:,:)); %first  pair index
+        j2_series{iview}=squeeze(j2_series{iview}(1,:,:)); %first  pair index
+        j1_series{iview}=j1_series{iview}(check_select);
+        j2_series{iview}=j2_series{iview}(check_select);
+    else
+        [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode);
+    end
+        
     %case of pairs (.nc files)
     i2=[];j1=[];j2=[];
@@ -64 +83 @@
             j2=j2_series{iview}(ifile);
         end
-        filecell{iview,ifile}=fullfile_uvmat(InputTable{iview,1},InputTable{iview,2},InputTable{iview,3},InputTable{iview,5},InputTable{iview,4}...
-            ,i1,i2,j1,j2);
+         filecell{iview,ifile}=fullfile_uvmat(InputTable{iview,1},InputTable{iview,2},InputTable{iview,3},InputTable{iview,5},InputTable{iview,4},i1,i2,j1,j2);
     end
 end