Changeset 884 for trunk/src/series

Timestamp:

Mar 23, 2015, 11:19:28 PM (10 years ago)

Author:

sommeria

Message:

bugs corrected

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (5 diffs)
• civ_input.m (modified) (1 diff)
• time_series.m (modified) (1 diff)

trunk/src/series/aver_stat.m

@@ -239 +239 @@
 end
 nbfiles=0;%counter of the successfully read files (bad files are skipped)
-VarMesh=NaN;
-if isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'})&& isfield(Param.ActionInput,'VarMesh')%case of histograms 
+VarMesh=[];
+if isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+    if isfield(Param,'ActionInput') && isfield(Param.ActionInput,'VarMesh')%case of histograms 
      VarMesh=Param.ActionInput.VarMesh;
+    else
+       VarMesh=[];
+       disp_uvmat('WARNING','automatic bin size for histograms, select aver_stat again to set the value',checkrun)
+    end
 end
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
@@ -312 +317 @@
             DataOut=Field;%outcome reproduces the first (projected) field by default
             DataOut.Conventions='uvmat'; %suppress Conventions='uvmat/civdata' for civ input files         
-            if ismember(Param.ProjObject.ProjMode,{'inside','outside'})%case of histograms
+            if isfield(Param,'ProjObject')&& ismember(Param.ProjObject.ProjMode,{'inside','outside'})%case of histograms
                 for ivar=1:numel(Field.ListVarName)% list of variable names before projection (histogram)
                     VarName=Field.ListVarName{ivar};
@@ -324 +329 @@
             else
                 errorvar=zeros(numel(Field.ListVarName));%index of errorflag associated to each variable
-                for ivar=1:numel(Field.ListVarName)
-                    VarName=Field.ListVarName{ivar};
-                    DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
-                    NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
-                    for iivar=1:length(Field.VarAttribute)
-                        if isequal(Field.VarDimName{iivar},Field.VarDimName{ivar})&& isfield(Field.VarAttribute{iivar},'Role')...
-                                && strcmp(Field.VarAttribute{iivar}.Role,'errorflag')
-                            errorvar(ivar)=iivar; % index of the errorflag variable corresponding to ivar
+                if isfield(Field,'VarAttribute')
+                    for ivar=1:numel(Field.ListVarName)
+                        VarName=Field.ListVarName{ivar};
+                        DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
+                        NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
+                        
+                        for iivar=1:length(Field.VarAttribute)
+                            if isequal(Field.VarDimName{iivar},Field.VarDimName{ivar})&& isfield(Field.VarAttribute{iivar},'Role')...
+                                    && strcmp(Field.VarAttribute{iivar}.Role,'errorflag')
+                                errorvar(ivar)=iivar; % index of the errorflag variable corresponding to ivar
+                            end
                         end
                     end
+                    DataOut.ListVarName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                    DataOut.VarDimName(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                    DataOut.VarAttribute(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                else
+                                   for ivar=1:numel(Field.ListVarName)
+                                       VarName=Field.ListVarName{ivar};
+                        DataOut.(VarName)=zeros(size(DataOut.(VarName)));% initiate each field to zero
+                        NbData.(VarName)=zeros(size(DataOut.(VarName)));% initiate the nbre of good data to zero
+                                   end
                 end
-                DataOut.ListVarName(errorvar(errorvar~=0))=[]; %remove errorflag from result
-                DataOut.VarDimName(errorvar(errorvar~=0))=[]; %remove errorflag from result
-                DataOut.VarAttribute(errorvar(errorvar~=0))=[]; %remove errorflag from result
+                
             end
         end   %current field
@@ -344 +359 @@
             sizmean=size(DataOut.(VarName));
             siz=size(Field.(VarName));
-            if ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+            if isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'})
                 if isfield(Data{1},VarName)
                     MaxValue=max(DataOut.(VarName));% current max of histogram absissa
@@ -387 +402 @@
 end
 %%%%%%%%%%%%%%%% end loop on field indices %%%%%%%%%%%%%%%%
-if ~ismember(Param.ProjObject.ProjMode,{'inside','outside'})
+if ~(isfield(Param,'ProjObject') && ismember(Param.ProjObject.ProjMode,{'inside','outside'}))
     for ivar=1:length(Field.ListVarName)
         VarName=Field.ListVarName{ivar};

trunk/src/series/civ_input.m

@@ -960 +960 @@
                 index_pair=index_pair+1;
                 displ_pair{index_pair}=['j= ' num2stra(numod_a,nom_type_ima) '-' num2stra(numod_b,nom_type_ima)];
-                displ_pair_dt{ipair}=displ_pair{ipair};
+                displ_pair_dt{index_pair}=displ_pair{index_pair};
                 dt(index_pair)=numod_b-numod_a;%default dt
                 if size(Time,1)>ref_i && size(Time,2)>numod_b  % && ~checkframe

trunk/src/series/time_series.m

@@ -304 +304 @@
     if isfield(Param,'ActionInput') && isfield(Param.ActionInput,'VarMesh')%case of histograms
         VarMesh=Param.ActionInput.VarMesh;
+    else
+        VarMesh=[];
+        disp_uvmat('WARNING','automatic bin size for histograms, select time_series again to set the value',checkrun)
     end
 end