Changeset 1154 for trunk/src/series

Timestamp:

Jul 7, 2024, 11:22:00 PM (3 months ago)

Author:

sommeria

Message:

various improvements

Location:

trunk/src/series

Files:

• civ_input.fig (modified) (previous)
• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (12 diffs)
• test_filter_tps.m (added)

trunk/src/series/civ_input.m

@@ -141 +141 @@
         iview_image=2;%line # for the input images
     otherwise 
-        if ~strcmp(FieldType,'image')
-        msgbox_uvmat('ERROR','civ_series needs images, scalar fields in netcdf format, or civ data as input')
-        return
-        end
+        % if ~strcmp(FileType,'image')
+        % msgbox_uvmat('ERROR','civ_series needs images, scalar fields in netcdf format, or civ data as input')
+        % return
+        % end
 end
         

trunk/src/series/civ_series.m

@@ -127 +127 @@
     end
     if isfield(Param,'InputTable')
-        [tild,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
+        [~,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
         iview_A=0;% series index (iview) for the first image series
         iview_B=0;% series index (iview) for the second image series (only non zero for option 'shift' comparing two image series )
@@ -195 +195 @@
                 j2_series_Civ2=j2_series_Civ1;
                 NomTypeNc='_1';
-            case 'PIV volume'
-                % TODO, TODO
         end
         %determine frame indices for input with movie or other multiframe input file
@@ -252 +250 @@
 Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
 Data.Program='civ_series';
+if isfield(Param,'UvmatRevision')
+    Data.Program=[Data.Program ', uvmat r' Param.UvmatRevision];
+end
 Data.CivStage=0;%default
 
@@ -509 +510 @@
             % caluclate velocity data (y and v in indices, reverse to y component)
             tstart_civ1=tic;
-            [xtable, ytable, utable, vtable, ctable, F, result_conv, errormsg] = civ (par_civ1);
+            [xtable, ytable, utable, vtable, ctable, FF, result_conv, errormsg] = civ (par_civ1);
             if ~isempty(errormsg)
                 disp_uvmat('ERROR',errormsg,checkrun)
@@ -519 +520 @@
             Data.Civ1_V=reshape(-vtable,[],1);
             Data.Civ1_C=reshape(ctable,[],1);
-            Data.Civ1_FF=reshape(F,[],1);
+            Data.Civ1_FF=reshape(FF,[],1);
             time_civ1=toc(tstart_civ1);
         end
@@ -601 +602 @@
 
         % perform Patch calculation using the UVMAT fct 'filter_tps'
-       
         [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...
             filter_tps([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),[],Data.Patch1_SubDomainSize,Data.Patch1_FieldSmooth,Data.Patch1_MaxDiff);
         Data.Civ1_U_smooth(ind_good)=Ures;% take the interpolated (smoothed) velocity values for good vectors, keep civ1 data for the other
         Data.Civ1_V_smooth(ind_good)=Vres;
-        Data.Civ1_FF(ind_good)=uint8(FFres);
+        Data.Civ1_FF(ind_good)=uint8(4*FFres);
         time_patch1=toc(tstart_patch1);
         disp('patch1 performed')
@@ -770 +770 @@
         % calculate velocity data (y and v in image indices, reverse to y component)
         
-        [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);
+        [xtable, ytable, utable, vtable, ctable, FF,result_conv,errormsg] = civ (par_civ2);
         
         list_param=(fieldnames(Param.ActionInput.Civ2))';
@@ -810 +810 @@
         Data.Civ2_V=reshape(-vtable,[],1);
         Data.Civ2_C=reshape(ctable,[],1);
-        Data.Civ2_FF=reshape(F,[],1);
+        Data.Civ2_FF=reshape(FF,[],1);
         disp('civ2 performed')
         time_civ2=toc(tstart_civ2);
@@ -821 +821 @@
                 return
             end
-%         elseif isfield(Param,'Civ2_X')% use Civ2 data as input in Param (test mode)
-%             Data.ListGlobalAttribute={};
-%             Data.ListVarName={};
-%             Data.VarDimName={};
-%             Data.Civ2_X=Param.Civ2_X;
-%             Data.Civ2_Y=Param.Civ2_Y;
-%             Data.Civ2_U=Param.Civ2_U;
-%             Data.Civ2_V=Param.Civ2_V;
-%             Data.Civ2_FF=Param.Civ2_FF;
         end
     end
@@ -886 +877 @@
         Data.Civ2_U_smooth(ind_good)=Ures;
         Data.Civ2_V_smooth(ind_good)=Vres;
-        Data.Civ2_FF(ind_good)=FFres;
+        Data.Civ2_FF(ind_good)=uint8(4*FFres);
         Data.CivStage=Data.CivStage+1;
         time_patch2=toc(tstart_patch2);
@@ -921 +912 @@
 % OUTPUT:
 % xtable: set of x coordinates
-% ytable: set of y coordiantes
+% ytable: set of y coordinates
 % utable: set of u displacements (along x)
 % vtable: set of v displacements (along y)
@@ -1278 +1269 @@
 % FF=2, for too small correlation
 % FF=3, for velocity outside bounds
-% FF=4 for exclusion by difference with the smoothed field, not set in this function
+% FF=4 for exclusion by difference with the smoothed field, set by call to function filter_tps
 
 if isfield (Param,'MinCorr')