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

Timestamp:

Mar 4, 2015, 12:01:38 AM (9 years ago)

Author:

sommeria

Message:

various bug fixes

File:

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

trunk/src/series/merge_proj.m

@@ -142 +142 @@
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
+    if CheckImage{iview}
+        ParamIn{iview}=MovieObject{iview};
+    else
+        ParamIn{iview}=Param.InputFields;
+    end
     CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files
     if ~isempty(j1_series{iview})
@@ -196 +201 @@
     FileExtOut='.nc'; %netcdf output
 end
+if isempty(j1_series{1})
+    NomTypeOut='_1';
+else
+    NomTypeOut='_1_1';
+end
 %NomTypeOut=NomType;% output file index will indicate the first and last ref index in the series
 RootFileOut=RootFile{1};
@@ -232 +242 @@
 
     %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
+tstart=tic; %used to record the computing time
 for index=1:NbField
         update_waitbar(WaitbarHandle,index/NbField)
@@ -238 +249 @@
         return
     end
-    
     %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
     Data=cell(1,NbView);%initiate the set Data
     timeread=zeros(1,NbView);
     for iview=1:NbView
-        %% reading input file(s)
-        [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
+        %% reading input file(s)      
+        [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},ParamIn{iview},frame_index{iview}(index));
         if ~isempty(errormsg)
             disp_uvmat('ERROR',['ERROR in merge_proj/read_field/' errormsg],checkrun)
@@ -323 +333 @@
         end
     end
-    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFileOut,FileExtOut,NomType{1},i1,i2,j1,j2);
+    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFileOut,FileExtOut,NomTypeOut,i1,i2,j1,j2);
 
     %% recording the merged field
@@ -337 +347 @@
             npy=siz(1);
             npx=siz(2);
-            if isfield(MergeData,'coord_x') && isfield(MergeData,'coord_y')
-                Rangx=MergeData.coord_x;
-                Rangy=MergeData.coord_y;
+            if isfield(MergeData,'Coord_x') && isfield(MergeData,'Coord_y')
+                Rangx=MergeData.Coord_x;
+                Rangy=MergeData.Coord_y;
             elseif isfield(MergeData,'AX')&& isfield(MergeData,'AY')
                 Rangx=[MergeData.AX(1) MergeData.AX(end)];
@@ -392 +402 @@
     end
 end
-
+disp(['total ellapsed time ' num2str(toc(tstart))])
 
 %'merge_field': concatene fields