Changeset 609 for trunk/src/series/time_series.m

Timestamp:

Apr 9, 2013, 8:20:00 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected after tests with Windows OS.

File:

• trunk/src/series/time_series.m (modified) (5 diffs)

trunk/src/series/time_series.m

@@ -75 +75 @@
 OutputDir=[Param.OutputSubDir Param.OutputDirExt];
 
-%% root input file(s) and type
+%% root input file(s) name, type and index series
 RootPath=Param.InputTable(:,1);
 RootFile=Param.InputTable(:,3);
@@ -90 +90 @@
 % i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
 %%%%%%%%%%%%
-% NbSlice=1;%default
-% if isfield(Param.IndexRange,'NbSlice')&&~isempty(Param.IndexRange.NbSlice)
-%     NbSlice=Param.IndexRange.NbSlice;
-% end
 nbview=numel(i1_series);%number of input file series (lines in InputTable)
 nbfield_j=size(j1_series{1},1); %nb of fields for the j index (bursts or volume slices)
 nbfield_i=size(i1_series{1},2); %nb of fields for the i index
 nbfield=nbfield_j*nbfield_i; %total number of fields
-
-%determine the file type on each line from the first input file
+[first_i,tild,last_i,first_j,tild,last_j,errormsg]=get_index_range(Param.IndexRange);
+if ~isempty(errormsg),display(errormsg),return,end
+
+%% determine the file type on each line from the first input file
 ImageTypeOptions={'image','multimage','mmreader','video'};
 NcTypeOptions={'netcdf','civx','civdata'};
@@ -151 +149 @@
     return
 end
-NomTypeOut='_1-2_1';% output file index will indicate the first and last ref index in the series
+NomTypeOut=nomtype2pair(NomType{1});% determine the index nomenclature type for the output file
 
 %% Set field names and velocity types
@@ -414 +412 @@
 end
 
-%name of result file
-OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(1),i1_series{1}(end),j1_series{1}(1),j1_series{1}(end));
+%% name of result file
+OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
 errormsg=struct2nc(OutputFile,DataOut); %save result file
 if isempty(errormsg)
@@ -422 +420 @@
     displ_uvmat('ERROR',['error in Series/struct2nc: ' errormsg],checkrun)
 end
-
 
 %% plot the time series (the last one in case of multislices)