Changeset 897 for trunk/src/series

Timestamp:

May 25, 2015, 8:48:58 PM (9 years ago)

Author:

sommeria

Message:

sub_background corrected for volume and multilevel cases

Location:

trunk/src/series

Files:

• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (1 diff)
• sub_background.m (modified) (12 diffs)

trunk/src/series/civ_input.m

@@ -1793 +1793 @@
      end
      Param.ActionInput.Civ1.CorrSmooth=0;% launch Civ1 with no data point (to get the image names for A and B)
+     Param.IndexRange.first_i=str2num(get(handles.ref_i,'String'));
+     Param.IndexRange.last_i=str2num(get(handles.ref_i,'String'));
+     if strcmp(get(handles.ref_j,'Visible'),'on')
+         Param.IndexRange.first_j=str2num(get(handles.ref_j,'String'));
+         Param.IndexRange.last_j=Param.IndexRange.first_j;
+     else
+         Param.IndexRange.first_j=1;
+         Param.IndexRange.last_j=1;
+     end
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results 
      if ~isempty(errormsg), return, end % rmq: error msg displayed in civ_series

trunk/src/series/civ_series.m

@@ -355 +355 @@
     % if Civ1 computation is requested
     if isfield (Param.ActionInput,'Civ1')
+        if CheckInputFile
         disp('civ1 started')
+        end
         par_civ1=Param.ActionInput.Civ1;
         if CheckInputFile % read input images (except in mode Test where it is introduced directly in Param.ActionInput.Civ1.ImageNameA and B)

trunk/src/series/sub_background.m

@@ -75 +75 @@
     ParamOut.AllowInputSort='off';% allow alphabetic sorting of the list of input file SubDir (options 'off'/'on', 'off' by default)
     ParamOut.WholeIndexRange='on';% prescribes the file index ranges from min to max (options 'off'/'on', 'off' by default)
-    ParamOut.NbSlice='on'; %nbre of slices ('off' by default)
+    ParamOut.NbSlice='on'; % edit box nbre of slices made active
     ParamOut.VelType='off';% menu for selecting the velocity type (options 'off'/'one'/'two',  'off' by default)
     ParamOut.FieldName='off';% menu for selecting the field (s) in the input file(options 'off'/'one'/'two', 'off' by default)
@@ -117 +117 @@
     
     %% numbers of fields
-    NbSlice=1;%default
+    NbSlice_i=1;%default
     if isfield(Param.IndexRange,'NbSlice')&&~isempty(Param.IndexRange.NbSlice)
-        NbSlice=Param.IndexRange.NbSlice;
+        NbSlice_i=Param.IndexRange.NbSlice;
     end
     incr_j=1;%default
@@ -130 +130 @@
         nbfield_j=numel(first_j:incr_j:last_j);%nb of fields for the j index (bursts or volume slices)
     end
-    incr_i=1;%default
-    first_i=1;last_i=1;incr_i;%default
+    first_i=1;last_i=1;incr_i=1;%default
     if isfield(Param.IndexRange,'first_i'); last_i=Param.IndexRange.first_i; end   
     if isfield(Param.IndexRange,'last_i'); last_i=Param.IndexRange.last_i; end
@@ -139 +138 @@
     nbfield_i=numel(first_i:incr_i:last_i);%nb of fields for the i index (bursts or volume slices)
     nbfield=nbfield_j*nbfield_i; %total number of fields
-    nbfield_i=floor(nbfield/NbSlice);%total number of  indexes in a slice (adjusted to an integer number of slices)
+    nbfield_i=floor(nbfield/NbSlice_i);%total number of  indexes in a slice (adjusted to an integer number of slices)
     
     %% setting of  parameters specific to sub_background
@@ -159 +158 @@
     
     %check input consistency
-    if strcmp(answer{1},'No') && ~isequal(NbSlice,1)
-        check=msgbox_uvmat('INPUT_Y-N',['confirm the multi-level splitting into ' num2str(NbSlice) ' slices']);
+    if strcmp(answer{1},'No') && ~isequal(NbSlice_i,1)
+        check=msgbox_uvmat('INPUT_Y-N',['confirm the multi-level splitting into ' num2str(NbSlice_i) ' slices']);
         if ~strcmp(check,'Yes')
             return
@@ -166 +165 @@
     end
     if strcmp(answer{1},'Yes')
-        step=1;
+        step=2;%the sliding background is shifted by the length of one burst, assumed =2 for volume ;ode
+        ParamOut.NbSlice=1; %nbre of slices displayed 
     else
         step=nbfield_j;%case of bursts: the sliding background is shifted by the length of one burst
@@ -198 +198 @@
 
 %% input preparation
-NbSlice=Param.IndexRange.NbSlice;
-if ~isequal(NbSlice,1)
-    display(['multi-level splitting into ' num2str(NbSlice) ' slices']);
+NbSlice_i=Param.IndexRange.NbSlice;
+if ~isequal(NbSlice_i,1)
+    display(['multi-level splitting into ' num2str(NbSlice_i) ' slices']);
 end
 RootPath=Param.InputTable(:,1);
@@ -207 +207 @@
 NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
-hdisp=disp_uvmat('WAITING...','checking the file series',checkrun);
-[filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
-if ~isempty(hdisp),delete(hdisp),end;
+%hdisp=disp_uvmat('WAITING...','checking the file series',checkrun);
+[filecell,i1_series,i2_series,j1_series]=get_file_series(Param);
+% if ~isempty(hdisp),delete(hdisp),end;
 %%%%%%%%%%%%
     % The cell array filecell is the list of input file names, while
@@ -225 +225 @@
         frame_index{1}=i1_series{1};
     end
-nbfield_j=size(i1_series{1},1); %nb of fields for the j index (bursts or volume slices)
-nbfield_i=size(i1_series{1},2); %nb of fields for the i index
-nbfield=nbfield_j*nbfield_i; %total number of fields
-nbfield_i=floor(nbfield/NbSlice);%total number of  indexes in a slice (adjusted to an integer number of slices)
-nbfield=nbfield_i*NbSlice; %total number of fields after adjustement
-
-%% output
+
+
+%% output file naming
 FileExtOut='.png'; % write result as .png images for image inputs
 if strcmp(lower(NomType{1}(end)),'a')
@@ -240 +236 @@
     NomTypeOut='_1_1';% caseof purely numerical indexing
 end
-
 OutputDir=[Param.OutputSubDir Param.OutputDirExt];
 
-if isequal(Param.ActionInput.CheckVolume,1)
-    step=1;
-else
+%% file index parameters
+% NbSlice_i: nbre of slices for i index: different of of 1 for multi-level,
+% the function sub_background is then relaunched by the GUI series for each
+%      slice, incrementing the first index i by 1
+% NbSlice_j: nbre of slices in volume mode
+% nbfield : total number of images treated per slice
+% step: shift of image index at each step of the sliding background (corresponding to the nbre of images in a burst)
+% nbaver_ima: nbre of the images in the sliding sequence used for the background
+% nbaver=nbaver_ima/step: nbre of bursts corresponding to nbaver_ima images. It has been adjusted so that nbaver is an odd integer
+nbfield_j=size(i1_series{1},1); %nb of fields for the j index (bursts or volume slices)
+nbfield_i=size(i1_series{1},2); %nb of fields for the i index
+nbfield=nbfield_j*nbfield_i; %total number of fields
+if Param.ActionInput.CheckVolume
+    step=2;% we assume the burst contains only one image pair
+    NbSlice_j=nbfield_j;
+    NbSlice=nbfield_j;
+    nbfield_series=nbfield_i;
+else 
     step=nbfield_j;%case of bursts: the sliding background is shifted by the length of one burst
+        NbSlice_j=1;
+        NbSlice=NbSlice_i;
+    nbfield_i=floor(nbfield/NbSlice_i);%total number of  indexes in a slice (adjusted to an integer number of slices)
+    nbfield=nbfield_i*NbSlice_i; %total number of fields after adjustement
+    nbfield_series=nbfield;
 end
 nbaver_ima=Param.ActionInput.SlidingSequenceLength;%number of images for the sliding background
@@ -258 +273 @@
     return
 end
-
-% calculate absolute brightness rank
+halfnbaver=floor(nbaver/2); % half width (in unit of bursts) of the sliding background 
+
+%% calculate absolute brightness rank
 rank=floor(Param.ActionInput.BrightnessRankThreshold*nbaver_ima);
 if rank==0
@@ -281 +297 @@
 end
 
-%% summary of the parameters:
-% nbfield : total number of images treated (in case of multislices the function sub_background is repeated for each slice)
-% step: shift at each step of the sliding background (corresponding to the nbre of images in a burst)
-% nbaver_ima: length of the sequence used for the sliding background
-
-% nbaver=nbaver_ima/step: nbaver_ima has been adjusted so that nbaver is an odd integer
-halfnbaver=floor(nbaver/2); % half width (in unit of bursts) of the sliding background 
-
-%% select the series of image indices to process
-indselect=1:step:nbfield;% select file indices of the slice
-for ifield=1:step-1
-    indselect=[indselect;indselect(end,:)+1];
-end
-
-%% read the first series of nbaver_ima images and sort by luminosity at each pixel
-for ifield = 1:nbaver_ima
-    ifile=indselect(ifield);
-    filename=filecell{1,ifile};
-    Aread=read_image(filename,FileType{1},MovieObject{1},frame_index{1}(ifile));
-    if ndims(Aread)==3;%color images
-        Aread=sum(double(Aread),3);% take the sum of color components
-    end
-    Ak(:,:,ifield)=Aread;
-end
-Asort=sort(Ak,3);%sort the luminosity of images at each point
-B=Asort(:,:,rank);%background image
-
-%% substract the first background image to the first images
-display( 'first background image will be substracted')
-for ifield=1:step*(halfnbaver+1);% nbre of images treated by the first background image
-    Acor=double(Ak(:,:,ifield))-double(B);%substract background to the current image
-    Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
-    ifile=indselect(ifield);
-    j1=1;
-    if ~isempty(j1_series{1})
-        j1=j1_series{1}(ifile);
-    end
-    newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
-    
-    %write result file
-    if Param.ActionInput.CheckLevelTransform
-        C=levels(Acor);
-        imwrite(C,newname,'BitDepth',8); % save the new image
-    else
-        if isequal(FileInfo{1}.BitDepth,16)
-            C=uint16(Acor);
-            imwrite(C,newname,'BitDepth',16); % save the new image
+
+%%%%%%%  LOOP ON SLICES FOR VOLUME SCAN %%%%%%%
+for j_slice=1:NbSlice_j
+    %% select the series of i indices to process
+    indselect=j_slice:step*NbSlice_j:nbfield;% select file indices of the slice
+    for ifield=1:step-1
+        indselect=[indselect;indselect(end,:)+NbSlice_j];
+    end
+    
+    %% read the first series of nbaver_ima images and sort by luminosity at each pixel
+    for ifield = 1:nbaver_ima
+        ifile=indselect(ifield);
+        filename=filecell{1,ifile};
+        Aread=read_image(filename,FileType{1},MovieObject{1},frame_index{1}(ifile));
+        if ndims(Aread)==3;%color images
+            Aread=sum(double(Aread),3);% take the sum of color components
+        end
+        Ak(:,:,ifield)=Aread;
+    end
+    Asort=sort(Ak,3);%sort the luminosity of images at each point
+    B=Asort(:,:,rank);%background image
+    
+    %% substract the first background image to the first images
+    display( 'first background image will be substracted')
+    for ifield=1:step*(halfnbaver+1);% nbre of images treated by the first background image
+        Acor=double(Ak(:,:,ifield))-double(B);%substract background to the current image
+        Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
+        ifile=indselect(ifield);
+        j1=1;
+        if ~isempty(j1_series{1})
+            j1=j1_series{1}(ifile);
+        end
+        newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
+        
+        %write result file
+        if Param.ActionInput.CheckLevelTransform
+            C=levels(Acor);
+            imwrite(C,newname,'BitDepth',8); % save the new image
         else
-            C=uint8(Acor);
+            if isequal(FileInfo{1}.BitDepth,16)
+                C=uint16(Acor);
+                imwrite(C,newname,'BitDepth',16); % save the new image
+            else
+                C=uint8(Acor);
+                imwrite(C,newname,'BitDepth',8); % save the new image
+            end
+        end
+        display([newname ' written'])
+    end
+    
+    %% repeat the operation on a sliding series of images
+    display('sliding background image will be substracted')
+    if nbfield_series > nbaver_ima
+        for ifield = step*(halfnbaver+1):step:nbfield_series-step*(halfnbaver+1)% ifield +iburst=index of the current processed image
+            update_waitbar(WaitbarHandle,ifield/nbfield_series)
+            if  ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+                disp('program stopped by user')
+                return
+            end
+            if nbaver_ima>step
+            Ak(:,:,1:nbaver_ima-step)=Ak(:,:,1+step:nbaver_ima);% shift the current image series by one burst (step)
+            end
+            %incorporate next burst in the current image series
+            for iburst=1:step
+                ifile=indselect(ifield+iburst+step*halfnbaver);
+                j1=1;
+                if ~isempty(j1_series{1})
+                    j1=j1_series{1}(ifile);
+                end
+                filename=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},i1_series{1}(ifile),[],j1);
+                Aread=read_image(filename,FileType{1},MovieObject{1},i1_series{1}(ifile));
+                if ndims(Aread)==3;%color images
+                    Aread=sum(double(Aread),3);% take the sum of color components
+                end
+                Ak(:,:,nbaver_ima-step+iburst)=Aread;% fill the last burst of the current image series by the new image
+            end
+            Asort=sort(Ak,3);%sort the new current image series by luminosity
+            B=Asort(:,:,rank);%current background image
+            %substract the background for the current burst
+            for iburst=1:step
+                Acor=double(Ak(:,:,step*halfnbaver+iburst))-double(B); %the current image has been already read ans stored as index step*halfnbaver+iburst in the current series
+                Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
+                ifile=indselect(ifield+iburst);
+                if ~isempty(j1_series{1})
+                    j1=j1_series{1}(ifile);
+                end
+                newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
+                %write result file
+                if Param.ActionInput.CheckLevelTransform
+                    C=levels(Acor);
+                    imwrite(C,newname,'BitDepth',8); % save the new image
+                else
+                    if isequal(FileInfo{1}.BitDepth,16)
+                        C=uint16(Acor);
+                        imwrite(C,newname,'BitDepth',16); % save the new image
+                    else
+                        C=uint8(Acor);
+                        imwrite(C,newname,'BitDepth',8); % save the new image
+                    end
+                end
+                display([newname ' written'])
+            end
+        end
+    end
+    
+    %% substract the background from the last images
+    display('last background image will be substracted')
+    for  ifield=nbfield_series-step*halfnbaver+1:nbfield_series
+        Acor=double(Ak(:,:,ifield-nbfield_series+step*(2*halfnbaver+1)))-double(B);
+        Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
+        ifile=indselect(ifield);
+        if ~isempty(j1_series{1})
+            j1=j1_series{1}(ifile);
+        end
+        newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
+        %write result file
+        if Param.ActionInput.CheckLevelTransform
+            C=levels(Acor);
             imwrite(C,newname,'BitDepth',8); % save the new image
-        end
-    end
-    display([newname ' written'])
-end
-
-%% repeat the operation on a sliding series of images
-display('sliding background image will be substracted')
-if nbfield_i > nbaver_ima
-    for ifield = step*(halfnbaver+1):step:nbfield_i-step*(halfnbaver+1)% ifield +iburst=index of the current processed image
-        update_waitbar(WaitbarHandle,ifield/nbfield_i)
-        if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
-            disp('program stopped by user')
-            return
-        end
-        Ak(:,:,1:nbaver_ima-step)=Ak(:,:,1+step:nbaver_ima);% shift the current image series by one burst (step)
-        %incorporate next burst in the current image series
-        for iburst=1:step
-            ifile=indselect(ifield+iburst+step*halfnbaver);
-            j1=1;
-    if ~isempty(j1_series{1})
-        j1=j1_series{1}(ifile);
-    end
-            filename=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},i1_series{1}(ifile),[],j1);
-            Aread=read_image(filename,FileType{1},MovieObject{1},i1_series{1}(ifile));
-            if ndims(Aread)==3;%color images
-                Aread=sum(double(Aread),3);% take the sum of color components
-            end
-            Ak(:,:,nbaver_ima-step+iburst)=Aread;% fill the last burst of the current image series by the new image
-        end
-        Asort=sort(Ak,3);%sort the new current image series by luminosity
-        B=Asort(:,:,rank);%current background image
-        %substract the background for the current burst
-        for iburst=1:step
-            Acor=double(Ak(:,:,step*halfnbaver+iburst))-double(B); %the current image has been already read ans stored as index step*halfnbaver+iburst in the current series
-            Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
-            ifile=indselect(ifield+iburst);
-            if ~isempty(j1_series{1})
-                j1=j1_series{1}(ifile);
-            end
-            newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
-            %write result file
-            if Param.ActionInput.CheckLevelTransform
-                C=levels(Acor);
+        else
+            if isequal(FileInfo{1}.BitDepth,16)
+                C=uint16(Acor);
+                imwrite(C,newname,'BitDepth',16); % save the new image
+            else
+                C=uint8(Acor);
                 imwrite(C,newname,'BitDepth',8); % save the new image
-            else
-                if isequal(FileInfo{1}.BitDepth,16)
-                    C=uint16(Acor);
-                    imwrite(C,newname,'BitDepth',16); % save the new image
-                else
-                    C=uint8(Acor);
-                    imwrite(C,newname,'BitDepth',8); % save the new image
-                end
-            end
-            display([newname ' written'])        
-        end
-    end
-end
-
-%% substract the background from the last images
-display('last background image will be substracted')
-for  ifield=nbfield_i-step*halfnbaver+1:nbfield_i
-    Acor=double(Ak(:,:,ifield-nbfield_i+step*(2*halfnbaver+1)))-double(B);
-    Acor=(Acor>0).*Acor; % put to 0 the negative elements in Acor
-    ifile=indselect(ifield);
-    if ~isempty(j1_series{1})
-        j1=j1_series{1}(ifile);
-    end
-    newname=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);  
-    %write result file
-    if Param.ActionInput.CheckLevelTransform
-        C=levels(Acor);
-        imwrite(C,newname,'BitDepth',8); % save the new image
-    else
-        if isequal(FileInfo{1}.BitDepth,16)
-            C=uint16(Acor);
-            imwrite(C,newname,'BitDepth',16); % save the new image
-        else
-            C=uint8(Acor);
-            imwrite(C,newname,'BitDepth',8); % save the new image
-        end
-    end
-    display([newname ' written'])
-end
-
+            end
+        end
+        display([newname ' written'])
+    end
+end