Changeset 374 for trunk/src/series/aver_stat.m

Timestamp:

Jan 16, 2012, 12:51:23 AM (12 years ago)

Author:

sommeria

Message:

fgunctions under series adapted to the renovated GUI series

File:

• trunk/src/series/aver_stat.m (modified) (16 diffs)

trunk/src/series/aver_stat.m

@@ -1 +1 @@
 %'aver_stat': calculate field average, used with series.fig
 %------------------------------------------------------------------------
-% function GUI_input=aver_stat(num_i1,num_i2,num_j1,num_j2,Series)
+% function GUI_input=aver_stat(Param)
 %
 %OUTPUT
@@ -7 +7 @@
 %
 %INPUT:
-%num_i1: series of first indices i (given from the series interface as first_i:incr_i:last_i, mode and list_pair_civ)
-%num_i2: series of second indices i (given from the series interface as first_i:incr_i:last_i, mode and list_pair_civ)
-%num_j1: series of first indices j (given from the series interface as first_j:incr_j:last_j, mode and list_pair_civ )
-%num_j2: series of second indices j (given from the series interface as first_j:incr_j:last_j, mode and list_pair_civ)
-%Series: Matlab structure containing information set by the series interface
+% Param: structure containing all the parameters read on the GUI series
+%  or name of the xml file containing these parameters (BATCH case)
 %
 function GUI_input=aver_stat(Param)
@@ -18 +15 @@
 %----------------------------------------------------------------------
 %INPUT: 
-%num_i1: series of first indices i (given from the series interface as first_i:incr_i:last_i, mode and list_pair_civ)
+%i1_series: series of first indices i (given from the series interface as first_i:incr_i:last_i, mode and list_pair_civ)
 %num_i2: series of second indices i (given from the series interface as first_i:incr_i:last_i, mode and list_pair_civ)
-%num_j1: series of first indices j (given from the series interface as first_j:incr_j:last_j, mode and list_pair_civ )
+%j1_series: series of first indices j (given from the series interface as first_j:incr_j:last_j, mode and list_pair_civ )
 %num_j2: series of second indices j (given from the series interface as first_j:incr_j:last_j, mode and list_pair_civ)
 %OTHER INPUTS given by the structure Series
@@ -44 +41 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Input parameters: read the xml file fior batch case
+%% input parameters
+% read the xml file for batch case
 if ischar(Param) && ~isempty(find(regexp('Param','.xml$')))
     Param=xml2struct(Param);
-    else
-        hseries=guidata(Param.hseries);%handles of the GUI series
+else %  RUN case: parameters introduced as the input structure Param
+    hseries=guidata(Param.hseries);%handles of the GUI series
     WaitbarPos=get(hseries.waitbar_frame,'Position');
 end
-Param
-Param.IndexRange
+[filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
+
+%% coordinate transform or other user defined transform (TODO: case BATCH ?)
+transform_fct='';%default
+if isfield(Param,'transform_fct') % transform function handle
+    transform_fct=Param.transform_fct;
+end
 
 %% projection object
@@ -67 +70 @@
 
 %% root input file and type
-% if ~iscell(Series.RootPath)% case of a single input field series
-%     num_i1={num_i1};num_j1={num_j1};num_i2={num_i2};num_j2={num_j2};
-%     RootPath={Series.RootPath};
-%     RootFile={Series.RootFile};
-%     SubDir={Series.SubDir};
-%     FileExt={Series.FileExt};
-%     NomType={Series.NomType};
-% else
-%     RootPath=Series.RootPath;
-%     RootFile=Series.RootFile;
-%     SubDir=Series.SubDir;
-%     NomType=Series.NomType;
-%     FileExt=Series.FileExt;
-% end   
     RootPath=Param.InputTable(:,1);
     RootFile=Param.InputTable(:,3);
@@ -103 +92 @@
     end
 end
+
 
 %% Number of input series: this function  accepts two input file series at most (then it operates on the difference of fields)
@@ -162 +152 @@
         elseif isempty(hget_field)
            filename=...
-                 name_generator(fullfile(RootPath{1},RootFile{1}),num_i1{1}(1),num_j1{1}(1),FileExt{1},NomType{1},1,num_i2{1}(1),num_j2{1}(1),SubDir{1}); 
+                 name_generator(fullfile(RootPath{1},RootFile{1}),i1_series{1}(1),j1_series{1}(1),FileExt{1},NomType{1},1,i2_series{1}(1),num_j2{1}(1),SubDir{1}); 
            get_field(filename);
            return
@@ -258 +248 @@
     end   
 end
-if size(time,2) < num_i2{1}(end) || size(time,3) < num_j2{1}(end)% ime array absent or too short in ImaDoc xml file' 
+if size(time,2) < i2_series{1}(end) || size(time,3) < num_j2{1}(end)% ime array absent or too short in ImaDoc xml file' 
     time=[];
 end
@@ -276 +266 @@
     pathdir=fullfile(RootPath{1},subdir_result);% full subdirectory name, including path
     if NbSlice==1% keep track of the first and lsat indices of the input files
-        NomTypeOut=nomtype2pair(NomType{1},num_i2{end}(end)-num_i1{1}(1),num_j2{end}(end)-num_j1{1}(1));
-        fileresult{1}=name_generator(filebase_out,num_i1{1}(1),num_j1{1}(1),ext_out,NomTypeOut,1,num_i2{end}(end),num_j2{end}(end),subdir_result);
+        %NomTypeOut=nomtype2pair(Param.InputTable{1,4},i2_series{end}(end)-i1_series{1}(1),j2_series{end}(end)-j1_series{1}(1));
+        NomTypeOut='_1-2';
+%         RootPath,SubDir,RootFile,FileExt,NomType,i1,i2,j1,j2)
+        fileresult{1}=fullfile_uvmat(RootPath{1},subdir_result,RootFile{1},ext_out,NomTypeOut,i1_series{1}(1),[],[],[]);
+%         fileresult{1}=name_generator(filebase_out,i1_series{1}(1),j1_series{1}(1),ext_out,NomTypeOut,1,i2_series{end}(end),j2_series{end}(end),subdir_result);
         testexist=exist(fileresult{1},'file');
     else % simplified indexing with i_slice for multiple slices
         testexist=0;
         for i_slice=1:NbSlice
-            fileresult{i_slice}=name_generator(filebase_out,i_slice,[],ext_out,'_1',1,i_slice,[],subdir_result);
+            fileresult{1}=fullfile_uvmat(RootPath{1},subdir_result,RootFile{1},ext_out,NomTypeOut,i_slice,[],[],[]);
+            %fileresult{i_slice}=name_generator(filebase_out,i_slice,[],ext_out,'_1',1,i_slice,[],subdir_result);
             if exist(fileresult{i_slice},'file')
                 testexist=1;
@@ -307 +301 @@
 
 %% coordinate transform or other user defined transform
-transform_fct=[];%default
-if isfield(Series,'transform_fct')
-    transform_fct=Param.transform_fct;
+transform_fct='';%default
+if isfield(Param,'FieldTransform')&&isfield(Param.FieldTransform,'transform_fct')
+    transform_fct=Param.FieldTransform.transform_fct;
 end
 
 %% main loop
-siz=size(num_i1{1});
+siz=size(i1_series{1});
 nbfield2=siz(1); %nb of consecutive fields at each level(burst
 nbfield=siz(1)*siz(2);
@@ -328 +322 @@
     % averaging loop
     for index=1:nbfield*nbfield2
-        stopstate=get(hseries.RUN,'BusyAction');
-        if isequal(stopstate,'queue') % enable STOP command
-            update_waitbar(hseries.waitbar,WaitbarPos,index/(nbfield*nbfield2))
+ %       stopstate=get(hseries.RUN,'BusyAction');
+ %       if isequal(stopstate,'queue') % enable STOP command
+         %   update_waitbar(hseries.waitbar,WaitbarPos,index/(nbfield*nbfield2))
             ifile=indselect(index);
             % reading input file(s)
             for iview=1:nbview
-                [filename]=...
-                    name_generator(filebase{iview},num_i1{iview}(ifile),num_j1{iview}(ifile),FileExt{iview},NomType{iview},1,num_i2{iview}(ifile),num_j2{iview}(ifile),SubDir{iview});
-                if ~isequal(FileType{iview},'netcdf')
+%                 [filename]=...
+%                     name_generator(filebase{iview},num_i1{iview}(ifile),num_j1{iview}(ifile),FileExt{iview},NomType{iview},1,num_i2{iview}(ifile),j2_series{iview}(ifile),SubDir{iview});
+                    filename=filecell{iview,index};
+                    if ~isequal(FileType{iview},'netcdf')
                     Data{iview}.ListVarName={'A'};
                     Data{iview}.AName='image';
                     switch FileType{iview}
                         case 'movie'
-                            A=read(MovieObject{iview},num_i1{iview}(ifile));
+                            A=read(MovieObject{iview},i1_series{iview}(ifile));
                         case 'avi'
-                            mov=aviread(filename,num_i1{iview}(ifile));
+                            mov=aviread(filename,i1_series{iview}(ifile));
                             A=frame2im(mov(1));
                         case 'vol'
                             A=imread(filename);
                         case 'multimage'
-                            A=imread(filename,num_i1{iview}(ifile));
+                            A=imread(filename,i1_series{iview}(ifile));
                         case 'image'
                             A=imread(filename);
@@ -381 +376 @@
             if ~isempty(transform_fct)
                 if ~isempty(NbSlice_calib)
-                    Data{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1;%Zindex for phys transform
+                    Data{iview}.ZIndex=mod(i1_series{iview}(ifile)-1,NbSlice_calib{1})+1;%Zindex for phys transform
                 end
                 if nbview==2
@@ -435 +430 @@
                 end
             end
-        end
+%         end
     end
     %end averaging loop
@@ -455 +450 @@
         end
     else  % time from ImaDoc prevails
-        DataMean.Time=time(1,num_i1{1}(1),num_j1{1}(1));
-        DataMean.Time_end=time(end,num_i1{end}(end),num_j1{end}(end));
+        DataMean.Time=time(1,i1_series{1}(1),j1_series{1}(1));
+        DataMean.Time_end=time(end,i1_series{end}(end),j1_series{end}(end));
     end
     
@@ -468 +463 @@
         display([fileresult{i_slice} ' written']);
     else %case of netcdf input file , determine global attributes
+        if isempty(strcmp('Conventions',DataMean.ListGlobalAttribute))
+            DataMean.ListGlobalAttribute=['Conventions' DataMean.ListGlobalAttribute];
+        end
+        DataMean.Conventions='uvmat';
         DataMean.ListGlobalAttribute=[DataMean.ListGlobalAttribute {Param.Action}];
         ActionKey='Action';
@@ -473 +472 @@
             ActionKey=[ActionKey '_1'];
         end
-        eval(['DataMean.' ActionKey '=Param.Action;'])
+        DataMean.(ActionKey)=Param.Action;
         DataMean.ListGlobalAttribute=[DataMean.ListGlobalAttribute {ActionKey}];
         if isfield(DataMean,'Time')