Changeset 1123 for trunk/src/series/civ_series.m

Timestamp:

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

Author:

sommeria

Message:

various improvements

File:

• trunk/src/series/civ_series.m (modified) (1 diff)

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