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

Timestamp:

Apr 23, 2024, 3:03:38 PM (13 days ago)

Author:

sommeria

Message:

fct for python added

File:

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

trunk/src/series/merge_proj.m

@@ -68 +68 @@
     ParamOut.FieldTransform = 'on';%can use a transform function
     %%%%% 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
+%         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
+        %     phys
+        %     phys_polar
+        %     sub_field
+        try
             for ilist=1:numel(ListTransform)
-                eval(ListTransform)
-            end
-        end
+                eval(ListTransform{ilist})
+            end
+        end
+
     ParamOut.TransformPath=fullfile(fileparts(which('uvmat')),'transform_field');% path to transform functions 
     %%%%%%%%
@@ -319 +324 @@
         if ~isempty(transform_fct)
             checksub=nargin(transform_fct);
-            if checksub==2
+            if checksub>=2
                 Data{iview}=transform_fct(Data{iview},XmlData{iview});
             elseif checksub==1
@@ -351 +356 @@
 
     %% merge the NbView fields 
-    if checksub<=2
+%     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
+%     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);