Changeset 446 for trunk/src/get_file_series.m

Timestamp:

Jun 11, 2012, 9:33:54 AM (12 years ago)

Author:

sommeria

Message:

series rationalized. TO BE TESTED.

File:

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

trunk/src/get_file_series.m

@@ -4 +4 @@
 %
 % OUTPUT:
-% filecell{i,j}: cell array with the two reference indices i and j representing the list of file names
-% i1_series,i2_series,j1_series,j2_series: corresponding arrays of indices i1,i2,j1,j2.
-%
+% filecell{iview,fileindex}: cell array representing the list of file names
+%        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
+
 % INPUT:
 % Param: structure of input parameters as read from the GUI series (by the function read_GUI)
@@ -25 +28 @@
     ref_j=first_j:incr_j:last_j;
 end
-% Pairs=Param.Pairs;
-
 
 %% determine the list of input file names
@@ -46 +47 @@
         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
 
@@ -70 +75 @@
 j1_series=[];
 if ~isempty(ref_j)
-%      i1_series=meshgrid(ref_i,ones(size(ref_j)));
-% %     j1_series=meshgrid(ref_i,ones(size(ref_j)));
-%     j1_series=meshgrid(ones(size(ref_i)),ref_j);
     [i1_series,j1_series]=meshgrid(ref_i,ref_j);
 end