Changeset 1123

Timestamp:

Aug 21, 2023, 5:53:05 PM (14 months ago)

Author:

sommeria

Message:

various improvements

Location:

trunk/src

Files:

• fill_GUI.m (modified) (1 diff)
• find_field_bounds.m (modified) (1 diff)
• script_delete_rdvision.m (added)
• script_readlvm.m (modified) (1 diff)
• series.m (modified) (1 diff)
• series/civ_series.m (modified) (1 diff)
• transform_field/FFT2_detrend.m (modified) (2 diffs)
• transform_field/signal_spectrum.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/fill_GUI.m

@@ -60 +60 @@
         hh=[];
         input_data=Param.(fields{ifield});
+        if isfield(Param,'Type') && isa(Param.Type,'matlab.graphics.primitive.Rectangle')
+            input_data='rectangle';
+        end
         check_done=0;
         if isfield(handles,fields{ifield})

trunk/src/find_field_bounds.m

@@ -34 +34 @@
 %% analyse input field
 [CellInfo,NbDimArray,errormsg]=find_field_cells(Field);% analyse  the input field structure
+if isempty(CellInfo)
+    errormsg='bad input field'
+    return
+end
 if ~isempty(errormsg)
-    errormsg=['uvmat /refresh_field / find_field_cells / ' errormsg];% display error
+    errormsg=['uvmat /refresh_field / find_field_cells / ' errormsg]% display error
     return
 end

trunk/src/script_readlvm.m

@@ -61 +61 @@
 
 %% check camera signal
-ind_start=find(Data.Trig_Cam>3.5,1,'first')
+ind_start=find(Data.Trig_cam>3.5,1,'first')
 disp(['camera starts at time ' num2str(Data.Time(ind_start))])
 %% transform and filter conductivity probe signals into [temperature-corrected] density

trunk/src/series.m

@@ -2720 +2720 @@
 
 %% NbSlice visibility
+if isfield(ParamOut,'OutputFileMode')&& strcmp(ParamOut.OutputFileMode,'NbSlice')
+    ParamOut.NbSlice='on';
+end
 if isfield(ParamOut,'NbSlice') && (strcmp(ParamOut.NbSlice,'on')||isnumeric(ParamOut.NbSlice))
     set(handles.num_NbSlice,'Visible','on')

trunk/src/series/civ_series.m

@@ -89 +89 @@
         end
     end
-    % estimated CPUTime
-%     CPUtime_unit=0.01;%estimated time for a multiplication (in microsecond)
-%     if isfield(Param.SeriesData,'FileInfo')&&isfield(Param.SeriesData.FileInfo{1},'Height')&&isfield(Param.SeriesData.FileInfo{1},'Width')
-%         pixnbre=Param.SeriesData.FileInfo{1}.Height*Param.SeriesData.FileInfo{1}.Width; % total number of pxels for input images  
-%         CPUtime=0;
-%         if isfield(Data.ActionInput,'Civ1')
-%             %BoxSize=Data.ActionInput.Civ1.CorrBoxSize(1)*Data.ActionInput.Civ1.CorrBoxSize(2);
-%             tic
-%             testboxa=rand(Data.ActionInput.Civ1.CorrBoxSize(1),Data.ActionInput.Civ1.CorrBoxSize(2));
-%             testboxb=rand(Data.ActionInput.Civ1.SearchBoxSize(1),Data.ActionInput.Civ1.SearchBoxSize(2));
-%             anss=conv2(testboxa,testboxb);
-%             CPUtime_unit=toc;
-%             nb_box=pixnbre/(Data.ActionInput.Civ1.Dx*Data.ActionInput.Civ1.Dy);    
-%             %nbpos=Data.ActionInput.Civ1.SearchBoxSize-Data.ActionInput.Civ1.CorrBoxSize;
-%             CPUtime=2*CPUtime_unit*nb_box%*BoxSize*nbpos(1)*nbpos(2);% adjustement factor 2 used
-%         end
-%         if isfield(Data.ActionInput,'Patch1')
-%             CPUtime=2*CPUtime;
-%         end
-%         if isfield(Data.ActionInput,'Civ2')
-%             tic
-%             testboxa=rand(Data.ActionInput.Civ2.CorrBoxSize(1),Data.ActionInput.Civ2.CorrBoxSize(2));
-%             testboxb=rand(Data.ActionInput.Civ2.SearchBoxSize(1),Data.ActionInput.Civ2.SearchBoxSize(2));
-%             anss=conv2(testboxa,testboxb);
-%             CPUtime_unit=toc;
-%             nb_box=pixnbre/(Data.ActionInput.Civ2.Dx*Data.ActionInput.Civ2.Dy);
-%             %BoxSize=Data.ActionInput.Civ2.CorrBoxSize(1)*Data.ActionInput.Civ2.CorrBoxSize(2);
-%             %nbpos=Data.ActionInput.Civ2.SearchBoxSize-Data.ActionInput.Civ2.CorrBoxSize;
-%             CPUtime=CPUtime+2*CPUtime_unit*nb_box;%*BoxSize*nbpos(1)*nbpos(2);
-%         end
-%         if isfield(Data.ActionInput,'Patch2')
-%             CPUtime=(4/3)*CPUtime;
-%         end
-%         Data.CPUTime=ceil(CPUtime/6); % estimated CPU time per field pair in minute
-%         Data.CPUTime=Data.CPUTime/10; % displqy CPU time with 1 digit beyond dot
-%     end
     return
 end

trunk/src/transform_field/FFT2_detrend.m

@@ -68 +68 @@
         VarName=DataIn.ListVarName{ivar};
         z=DataIn.(VarName);
+        z(isnan(z))=0;% set to 0 NaN values
         rhs(1) = sum(sum(x.*z)); rhs(2) = sum(sum(y.*z)); rhs(3) = sum(sum(z));
         lin_coeff = inv(coeff)*rhs';
@@ -75 +76 @@
         spec2 = spec2(Iy,Ix);
         spec2 = spec2(ss,:);
-        %DataOut.(VarName) = log(spec2);
-        DataOut.(VarName) = spec2;
+        DataOut.(VarName) = log10(spec2);
+        %DataOut.(VarName) = spec2;
         spec_sum=sum(sum(spec2));
         kx_mean=sum(sum(spec2.*kx))/spec_sum;

trunk/src/transform_field/signal_spectrum.m

@@ -170 +170 @@
     if numel(ind_good)>WindowLength
         NbPos=NbPos+1;
-        if ~isempty(ind_bad)
+        if ~isempty(ind_bad)WindowLength
             sample=sample(ind_good); % keep only  non NaN data
             NbNan=NbNan+numel(ind_bad);

trunk/src/uvmat.m

@@ -5000 +5000 @@
         menu={'civ1';'filter1';'civ2';'filter2';'civ3';'filter3'};
         imax=[0 1 1 2 3 3 4 5 5 6];
-        imax=imax(Civ+1);
+        imax=imax(min(Civ+1,10));
 %         if isequal(Civ,0)
 %             imax=0;