Changeset 453 for trunk/src/get_file_series.m

Timestamp:

Jun 13, 2012, 5:03:06 PM (12 years ago)

Author:

sommeria

Message:

series adapted to BATCH mode. Tests still needed.

File:

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

trunk/src/get_file_series.m

@@ -7 +7 @@
 %        iview: line in the table corresponding to a given file series
 %        fileindex: file index within  the file series, 
-% i1_series(iview,ref_j,ref_i)... are the corresponding arrays of indices i1,i2,j1,j2, depending on the input line iview and the two reference indices ref_i,ref_j 
-% i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
+% i1_series{iview}(ref_j,ref_i)... are the corresponding arrays of indices i1,i2,j1,j2, depending on the input line iview and the two reference indices ref_i,ref_j 
+% i1_series{iview}(fileindex) expresses the same indices as a 1D array in file indices
 
 % INPUT:
@@ -50 +50 @@
         r(1).mode='';
     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);
+    [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);
     %case of pairs (.nc files)
     i2=[];j1=[];j2=[];
-    for ifile=1:numel(i1_series_iview)
-        i1=i1_series_iview(ifile);
-        if ~isempty(i2_series_iview)
-            i2=i2_series_iview(ifile);
+    for ifile=1:numel(i1_series{iview})
+        i1=i1_series{iview}(ifile);
+        if ~isempty(i2_series{iview})
+            i2=i2_series{iview}(ifile);
         end
-        if ~isempty(j1_series_iview)
-            j1=j1_series_iview(ifile);
+        if ~isempty(j1_series{iview})
+            j1=j1_series{iview}(ifile);
         end
-        if ~isempty(j2_series_iview)
-            j2=j2_series_iview(ifile);
+        if ~isempty(j2_series{iview})
+            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);
     end
-    i1_series(iview,:,:)=i1_series_iview;
-    i2_series(iview,:,:)=i2_series_iview;
-    j1_series(iview,:,:)=j1_series_iview;
-    j2_series(iview,:,:)=j2_series_iview;
 end