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

Timestamp:

Apr 19, 2024, 8:21:23 PM (15 months ago)

Author:

sommeria

Message:

adapted to reading hdf5 data from fluidimage, extract_rdvision improved

File:

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

trunk/src/series/merge_proj.m

@@ -67 +67 @@
     ParamOut.FieldName='one';% menu for selecting the field (s) in the input file(options 'off'/'one'/'two', 'off' by default)
     ParamOut.FieldTransform = 'on';%can use a transform function
-    ParamOut.TransformPath=fullfile(fileparts(which('uvmat')),'transform_field');% path to transform functions (needed for compilation only)
+    %%%%% list of possible transform functions (needed only for compilation)
+        ListTransform={'phys','phys_polar','sub_field'};%list of possible transform functions (needed only for compilation)
+        if 0==1 %never satisfied but trigger compilation with the appropriate transform functions
+            for ilist=1:numel(ListTransform)
+                eval(ListTransform)
+            end
+        end
+    ParamOut.TransformPath=fullfile(fileparts(which('uvmat')),'transform_field');% path to transform functions 
+    %%%%%%%%
     ParamOut.ProjObject='on';%can use projection object(option 'off'/'on',
     ParamOut.Mask='on';%can use mask option   (option 'off'/'on', 'off' by default)
@@ -86 +94 @@
     return
 end
-if 0==1
-    phys; % used to include phys when compiling is done
-end
+
 %%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
 ParamOut=[]; %default output
@@ -115 +121 @@
 RootFile=Param.InputTable(:,3);
 SubDir=Param.InputTable(:,2);
-% NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
 
@@ -126 +131 @@
 % i1_series(iview,ref_j,ref_i)... are the corresponding arrays of indices i1,i2,j1,j2, depending on the input line iview and the two reference indices ref_i,ref_j 
 % i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
-if ~isempty(hdisp),delete(hdisp),end;%end the waiting display
+if ~isempty(hdisp),delete(hdisp),end %end the waiting display
 
 NbView=numel(i1_series);%number of input file series (lines in InputTable)
@@ -134 +139 @@
 
 %% determine the file type on each line from the first input file 
-NcTypeOptions={'netcdf','civx','civdata'};
+NcTypeOptions={'netcdf','civx','civdata','pivdata_fluidimage'};
 for iview=1:NbView
     if ~exist(filecell{iview,1}','file')
@@ -178 +183 @@
 %% coordinate transform or other user defined transform
 transform_fct='';%default fct handle
+ checksub=0;
 if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
     currentdir=pwd;
@@ -187 +193 @@
             XmlData{iview}.TransformInput=Param.TransformInput;
         end
-    end       
+    end 
+    checksub=nargin(transform_fct);% number of input arguments for the selected transform fct
+    if checksub>2 && NbView>2
+        disp_uvmat('WARNING',['only the two first input file series will be combined by ' Param.FieldTransform.TransformName],checkrun)
+    end
 end
 %%%%%%%%%%%% END STANDARD PART  %%%%%%%%%%%%
@@ -305 +315 @@
         end
         
-        %% transform the input field (e.g; phys) if requested (no transform involving two input fields)
+        %% transform the input field iview (e.g; phys) if requested (no transform involving two input fields at this stage)
+        checksub=0;
         if ~isempty(transform_fct)
-            if nargin(transform_fct)>=2
+            checksub=nargin(transform_fct);
+            if checksub==2
                 Data{iview}=transform_fct(Data{iview},XmlData{iview});
-            else
+            elseif checksub==1
                 Data{iview}=transform_fct(Data{iview});
             end
@@ -338 +350 @@
     %%%%%%%%%%%%%%%% END LOOP ON VIEWS %%%%%%%%%%%%%%%%
 
-    %% merge the NbView fields
-    [MergeData,errormsg]=merge_field(Data);
+    %% merge the NbView fields 
+    if checksub<=2
+        [MergeData,errormsg]=merge_field(Data);%concatene all the input field series by fct merge_data
+    elseif checksub==3
+        MergeData=transform_fct(Data{1},XmlData{1},Data{2}); %combine the two input file series
+    else
+        MergeData=transform_fct(Data{1},XmlData{1},Data{2},XmlData{2});%combine the two input file series with calibration parameters
+    end
     if ~isempty(errormsg)
         disp_uvmat('ERROR',errormsg,checkrun);