Changeset 1172 for trunk/src

Timestamp:

Feb 24, 2025, 7:49:59 PM (3 weeks ago)

Author:

sommeria

Message:

bug add points geometry_calib repaired

Location:

trunk/src

Files:

• get_file_index.m (modified) (1 diff)
• mouse_down.m (modified) (1 diff)
• series/sub_background.m (modified) (7 diffs)
• series/sub_background_special.m (deleted)

trunk/src/get_file_index.m

@@ -1 @@
-%=======================================================================
+
+%'get_file_index': determine the frame indexes from ref indices and pair option for civ
+% [i1,i2,j1,j2] = get_file_index(ref_i,ref_j,PairString)
+%------------------------------------------------------------------------
+% OUTPUT:
+% i1,i2,j1,j2: frem indices i and j for image 1 and 2
+%
+% INPUT:
+% ref_i,ref_j: reference indices set in the GUI series
+% PairString: string defining the choice of pairing: 'Di=..','Dj=..','-'
+
+%=====================================================================
 % Copyright 2008-2024, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
 %   http://www.legi.grenoble-inp.fr

trunk/src/mouse_down.m

@@ -493 +493 @@
         h_ListCoord=hh_geometry_calib.ListCoord; %findobj(h_geometry_calib,'Tag','ListCoord');
         Coord=get(h_ListCoord,'Data');
+        Coord=Coord(:,1:6);
         %data=read_geometry_calib(Coord);%transform char cell to numbers
         xlim=get(haxes,'XLim');

trunk/src/series/sub_background.m

@@ -229 +229 @@
 NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
-%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;
+[filecell,i1_series,i2_series,j1_series]=get_file_series(Param);%series of file names organised as a single array
+
 %%%%%%%%%%%%
     % The cell array filecell is the list of input file names, while
@@ -280 +279 @@
     step=nbfield_j;%case of bursts: the sliding background is shifted by the length of one burst
     NbSlice_j=1;
-    %nbfield_i=floor(nbfield_i/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_i*nbfield_j;
 end
@@ -314 +311 @@
 end
 
-
-%%%%%%%  LOOP ON SLICES FOR VOLUME SCAN %%%%%%%
-for j_slice=1:NbSlice_j
+%selection of frame indices
+if Param.ActionInput.CheckVolume 
+    nbfield=floor(nbfield/NbSlice_j)*NbSlice_j;% truncate the total number of frames in case of incomplete series
+    indselect=1:nbfield;
+     indselect=reshape(indselect,NbSlice_j,[]);
+      NbSlice=NbSlice_j;
+else
+       NbSlice=NbSlice_i;
+    nbfield=floor(nbfield/NbSlice)*NbSlice;% truncate the total number of frames in case of incomplete series
+    indselect=reshape(1:nbfield,NbSlice,[]);
+    for j_slice=1:NbSlice
+    indselect(j_slice,:)=j_slice:step*NbSlice:nbfield;% select file indices of the slice
+    end
+end
+
+%%%%%%%  LOOP ON SLICES %%%%%%%
+for j_slice=1:NbSlice
     %% 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
+ %   indselect=j_slice:step*NbSlice_j:nbfield;% select file indices of the slice
+%     for ifield=1:step-1
+%         indselect=[indselect;indselect(end,:)+NbSlice];
+%     end
     
     %% read the first series of nbaver_ima images and sort by luminosity at each pixel
     for ifield = 1:nbaver_ima
-        ifile=indselect(ifield);
+        ifile=indselect(jslice,ifield);
         filename=filecell{1,ifile};
         Aread=read_image(filename,FileType{1},MovieObject{1},frame_index{1}(ifile));
@@ -341 +352 @@
         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);
+        ifile=indselect(jslice,ifield);
         j1=1;
         if ~isempty(j1_series{1})
@@ -381 +392 @@
             %incorporate next burst in the current image series
             for iburst=1:step
-                ifile=indselect(ifield+iburst+step*halfnbaver);
+                ifile=indselect(jslice,ifield+iburst+step*halfnbaver);
                 j1=1;
                 if ~isempty(j1_series{1})
@@ -400 +411 @@
                 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);
+                ifile=indselect(jslice,ifield+iburst);
                 if ~isempty(j1_series{1})
                     j1=j1_series{1}(ifile);
@@ -428 +439 @@
         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);
+        ifile=indselect(jslice,ifield);
         if ~isempty(j1_series{1})
             j1=j1_series{1}(ifile);