Changeset 668 for trunk/src/series/merge_proj.m

Timestamp:

Jul 15, 2013, 2:50:47 PM (11 years ago)

Author:

sommeria

Message:

a few bugs corrected.
multimask introduced in merge_proj
displ_uvmat transformed into disp_uvmat

File:

• trunk/src/series/merge_proj.m (modified) (7 diffs)

trunk/src/series/merge_proj.m

@@ -111 +111 @@
 for iview=1:NbView
     if ~exist(filecell{iview,1}','file')
-        displ_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun)
+        disp_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun)
         return
     end
@@ -129 +129 @@
     diff_time=max(max(diff(time)));
     if diff_time>0 
-        displ_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
+        disp_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
     end   
 end
@@ -150 +150 @@
     FileExtOut='.nc';% write result as .nc files for netcdf inputs
 else
-    displ_uvmat('ERROR',['invalid file type input ' FileType{1}],checkrun)
+    disp_uvmat('ERROR',['invalid file type input ' FileType{1}],checkrun)
     return
 end
 for iview=1:NbView
     if ~isequal(CheckImage{iview},CheckImage{1})||~isequal(CheckNc{iview},CheckNc{1})
-        displ_uvmat('ERROR','input set of input series: need  either netcdf either image series',checkrun)
+        disp_uvmat('ERROR','input set of input series: need  either netcdf either image series',checkrun)
         return
     end
@@ -162 +162 @@
 
 %% mask (TODO: case of multilevels)
+MaskData=cell(NbView,1);
 if Param.CheckMask
-    MaskData=cell(NbView,1);
-    MaskSubDir=regexprep(Param.InputTable{iview,2},'\..*','');%take the root part of SubDir, before the first dot '.'
-    MaskName=fullfile(Param.InputTable{iview,1},[MaskSubDir '.mask'],'mask_1.png');
-    if exist(MaskName,'file')
-        [MaskData{iview},tild,errormsg] = read_field(MaskName,'image');
+    for iview=1:numel(Param.MaskTable)
+%     MaskData=cell(NbView,1);
+%     MaskSubDir=regexprep(Param.InputTable{iview,2},'\..*','');%take the root part of SubDir, before the first dot '.'
+%     MaskName=fullfile(Param.InputTable{iview,1},[MaskSubDir '.mask'],'mask_1.png');
+%     if exist(MaskName,'file')
+        [MaskData{iview},tild,errormsg] = read_field(Param.MaskTable{iview},'image');
         if ~isempty(transform_fct) && nargin(transform_fct)>=2
-            MaskData{iview}=transform_fct(MaskData,XmlData{iview});
+            MaskData{iview}=transform_fct(MaskData{iview},XmlData{iview});
         end
     end
@@ -301 +303 @@
         GeometryCal.Tx_Ty_Tz=[T_x T_y 1];
         ImaDoc.GeometryCalib=GeometryCal;
-        %             t=struct2xml(ImaDoc);
-        %             t=set(t,1,'name','ImaDoc');
-        %             save(t,[filebase_merge '.xml'])
-        %             display([filebase_merge '.xml saved'])
     else
         MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','nb_coord','nb_dim','dt','Time','civ'};
@@ -351 +349 @@
 
 %% group the variables (fields of 'Data') in cells of variables with the same dimensions
-[CellVarIndex,NbDim,VarTypeCell]=find_field_cells(Data{1});
+[CellInfo,NbDim,errormsg]=find_field_cells(Data{1});
 %LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS
 % CellVarIndex=cells of variable index arrays
-for icell=1:length(CellVarIndex)
+for icell=1:length(CellInfo)
     if NbDim(icell)==1
-        continue
-    end
-    VarIndex=CellVarIndex{icell};%  indices of the selected variables in the list FieldData.ListVarName
-    VarType=VarTypeCell{icell};
-    ivar_X=VarType.coord_x;
-    ivar_Y=VarType.coord_y;
-    ivar_FF=VarType.errorflag;
+        continue% skip field cells which are of dim 1
+    end
+    VarIndex=CellInfo{icell}.VarIndex;%  indices of the selected variables in the list FieldData.ListVarName
+%     VarType=VarTypeCell{icell};
+    ivar_X=CellInfo{icell}.CoordIndex(1);
+    ivar_Y=CellInfo{icell}.CoordIndex(2);
+%     ivar_Y=VarType.coord_y;
+    ivar_FF=CellInfo{icell}.VarIndex_errorflag;
     if isempty(ivar_X)
         test_grid=1;%test for input data on regular grid (e.g. image)coordinates
     else
         if length(ivar_Y)~=1
-                displ_uvmat('ERROR','y coordinate missing in proj_field.m',checkrun)
+                disp_uvmat('ERROR','y coordinate missing in proj_field.m',checkrun)
                 return
         end
@@ -373 +372 @@
     end
     %case of input fields with unstructured coordinates
-    if ~test_grid
+    if isequal(CellInfo{icell}.CoordType,'scattered')
         for ivar=VarIndex
             VarName=MergeData.ListVarName{ivar};