Changeset 620 for trunk/src/read_multimadoc.m

Timestamp:

Apr 25, 2013, 10:25:20 PM (12 years ago)

Author:

sommeria

Message:

bugs repaired in series + cleaning.
Introducing of a demo program (test stage)

File:

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

trunk/src/read_multimadoc.m

@@ -1 @@
-%'read_multimadoc': read a set of Imadoc files and compare their timing of different file series
+%'read_multimadoc': read a set of Imadoc files for different file series and compare their timing 
 %------------------------------------------------------------------------
-% [XmlData,NbSlice_calib,time,errormsg]=read_multimadoc(RootPath,SubDir,RootFile,FileExt,i1_series,i2_series,j1_series,j2_series)
+% [XmlData,NbSlice_calib,time,warnmsg]=read_multimadoc(RootPath,SubDir,RootFile,FileExt,i1_series,i2_series,j1_series,j2_series)
 %
 % OUTPUT:
-% XmlData: cell array of structure representing the contents of the xml files
+% XmlData(iview): cell array of structures representing the contents of the xml files, iview =index of the input file series
 % NbSlice_calib: nbre of slices detected in the geometric calibration data
-% mtrix of times
-% errormsg: error message, ='' if reading OK
+% Time(iview,i,j): matrix of times, iview =index of the series, i,j=file indices within the series
+% warnmsg: warning message, ='' if  OK
 %
 % INPUT:
 % RootPath,SubDir,RootFile,FileExt: cell arrays characterizing the input file series
-% i1_series,i2_series,j1_series,j2_series: cell arrays of file index
-% arrays, as given by the fct uvmat/get_file_series
+% i1_series,i2_series,j1_series,j2_series: cell arrays of file index arrays, as given by the fct uvmat/get_file_series
 %
-function [XmlData,NbSlice_calib,time,errormsg]=read_multimadoc(RootPath,SubDir,RootFile,FileExt,i1_series,i2_series,j1_series,j2_series)
-errormsg='';
+function [XmlData,NbSlice_calib,Time,warnmsg]=read_multimadoc(RootPath,SubDir,RootFile,FileExt,i1_series,i2_series,j1_series,j2_series)
+warnmsg='';
 if ischar(RootPath)
     RootPath={RootPath};SubDir={SubDir};RootFile={RootFile};FileExt={FileExt};
@@ -26 +25 @@
     XmlFileName=find_imadoc(RootPath{iview},SubDir{iview},RootFile{iview},FileExt{iview});
     if ~isempty(XmlFileName)
-        [XmlData{iview},errormsg]=imadoc2struct(XmlFileName);% read the ImaDoc xml file
-        if ~isempty(errormsg)
-            return
-        end
+        [XmlData{iview},warnmsg]=imadoc2struct(XmlFileName);% read the ImaDoc xml file
     end
     if isfield(XmlData{iview},'Time')
@@ -37 +33 @@
         NbSlice_calib{iview}=size(XmlData{iview}.GeometryCalib.SliceCoord,1);%nbre of slices for Zindex in phys transform
         if ~isequal(NbSlice_calib{iview},NbSlice_calib{1})
-            msgbox_uvmat('WARNING','inconsistent number of Z indices for the two field series');
+            warnmsg='inconsistent number of Z indices in field series';
         end
     end
@@ -44 +40 @@
 %% check coincidence in time for several input file series
 if isempty(timecell)
-    time=[];
+    Time=[];
 else
-    time=get_time(timecell{1},i1_series{1},i2_series{1},j1_series{1},j2_series{1});
+    Time=get_time(timecell{1},i1_series{1},i2_series{1},j1_series{1},j2_series{1});
 end
 if nbview>1
-    time=shiftdim(time,-1); % add a singleton dimension for nbview
+    Time=shiftdim(Time,-1); % add a singleton dimension for nbview
     for icell=2:nbview
         if isequal(size(timecell{icell}),size(timecell{1}))
             time_line=get_time(timecell{icell},i1_series{icell},i2_series{icell},j1_series{icell},j2_series{icell});
-            time=cat(1,time,shiftdim(time_line,-1));
+            Time=cat(1,Time,shiftdim(time_line,-1));
         else
             msgbox_uvmat('WARNING','inconsistent time array dimensions in ImaDoc fields, the time for the first series is used')
-            time=cat(1,time,time(icell-1,:,:));
+            Time=cat(1,Time,Time(1,:,:));% copy times of the first line
             break
         end