Changeset 1137 for trunk/src/series

Timestamp:

Apr 24, 2024, 7:45:09 PM (5 months ago)

Author:

sommeria

Message:

tps improved by a cosine window in each subdomain. Default size of subdomains reduced for faster computation in the civ interface

Location:

trunk/src/series

Files:

• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (1 diff)
• merge_proj.m (modified) (5 diffs)

trunk/src/series/civ_input.m

@@ -81 +81 @@
     set(handles.CheckThreshold,'Visible','on')
     set(handles.CheckDeformation,'Value',0)% desactivate 
+    set(handles.num_SubDomainSize(1),'String','250')
+    set(handles.num_SubDomainSize(2),'String','500')
 end
 switch Param.Action.ActionName

trunk/src/series/civ_series.m

@@ -924 +924 @@
         time_total=toc(tstart);
         disp(['ellapsed time ' num2str(time_total/60,2) ' minutes'])
-        disp(['time image reading ' num2str(time_input/60,2) ' minutes'])
-        disp(['time civ1 ' num2str(time_civ1/60,2) ' minutes'])
-        disp(['time patch1 ' num2str(time_patch1/60,2) ' minutes'])
-        disp(['time civ2 ' num2str(time_civ2/60,2) ' minutes'])
-        disp(['time patch2 ' num2str(time_patch2/60,2) ' minutes'])
-        disp(['time other ' num2str((time_total-time_input-time_civ1-time_patch1-time_civ2-time_patch2)/60,2) ' minutes'])
+        disp(['time image reading ' num2str(time_input,2) ' s'])
+        disp(['time civ1 ' num2str(time_civ1,2) ' s'])
+        disp(['time patch1 ' num2str(time_patch1,2) ' s'])
+        disp(['time civ2 ' num2str(time_civ2,2) ' s'])
+        disp(['time patch2 ' num2str(time_patch2,2) ' s'])
+        disp(['time other ' num2str((time_total-time_input-time_civ1-time_patch1-time_civ2-time_patch2),2) ' s'])
     end
 end

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
-        %     phys
-        %     phys_polar
-        %     sub_field
-        try
-            for ilist=1:numel(ListTransform)
-                eval(ListTransform{ilist})
-            end
-        end
+    if 0==1 %never satisfied but trigger compilation with the appropriate transform functions ('eval' inactive for compilation)
+        phys
+        phys_polar
+        sub_field
+    end
 
     ParamOut.TransformPath=fullfile(fileparts(which('uvmat')),'transform_field');% path to transform functions 
@@ -192 +187 @@
     currentdir=pwd;
     cd(Param.FieldTransform.TransformPath)
+    if strcmp(Param.FieldTransform.TransformName,'sub_field')
+        checksub=2;% the two into field series will be subtracted
+    end
     transform_fct=str2func(Param.FieldTransform.TransformName);
     cd (currentdir)
@@ -199 +197 @@
         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)
@@ -321 +318 @@
         
         %% 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 ~isempty(transform_fct)&& checksub==0
             checksub=nargin(transform_fct);
-            if checksub>=2
+            if nargin(transform_fct)>=2
                 Data{iview}=transform_fct(Data{iview},XmlData{iview});
-            elseif checksub==1
+            else
                 Data{iview}=transform_fct(Data{iview});
             end
@@ -356 +352 @@
 
     %% merge the NbView fields 
-%     if checksub<=2
+    if checksub==0
         [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
+    else
+        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);