Changeset 88 for trunk/src/geometry_calib.m

Timestamp:

May 9, 2010, 10:40:18 AM (14 years ago)

Author:

sommeria

Message:

plot_field: test for multicomponent image (-> errormsg)
creat_grid: possibility of changing the figure name (for detect_grid)
geometry_calib: detect_grid improved (range of search adjusted from grid mesh)

bug repaired in translate points

uvmat: bug repair: dela with the case with several get_field GUI opened

File:

• trunk/src/geometry_calib.m (modified) (4 diffs)

trunk/src/geometry_calib.m

@@ -954 +954 @@
     grid_input=CalibData.grid;%retrieve the previously used grid
 end
-[T,CalibData.grid]=create_grid(grid_input);%display the GUI create_grid 
+[T,CalibData.grid]=create_grid(grid_input,'detect grid');%display the GUI create_grid 
 set(handles.geometry_calib,'UserData',CalibData)%store the phys grid for later use
 
@@ -1012 +1012 @@
 %Amax=max(max(Amod))
 %image(Rangx,Rangy,uint8(255*Amod/Amax))
-ind_range=10;% range of search of image ma around each point obtained by linear interpolation from the marked points
+Dx=(Rangx(2)-Rangx(1))/(npxy(2)-1); %x mesh in real space
+Dy=(Rangy(2)-Rangy(1))/(npxy(1)-1); %y mesh in real space
+ind_range_x=ceil(GeometryCalib.R(1,1)*CalibData.grid.Dx/3)% range of search of image ma around each point obtained by linear interpolation from the marked points
+ind_range_y=ceil(GeometryCalib.R(2,2)*CalibData.grid.Dy/3)% range of search of image ma around each point obtained by linear interpolation from the marked points
 nbpoints=size(T,1);
 for ipoint=1:nbpoints
-    Dx=(Rangx(2)-Rangx(1))/(npxy(2)-1); %x mesh in real space
-    Dy=(Rangy(2)-Rangy(1))/(npxy(1)-1); %y mesh in real space
     i0=1+round((T(ipoint,1)-Rangx(1))/Dx);%round(Xpx(ipoint));
     j0=1+round((T(ipoint,2)-Rangy(1))/Dy);%round(Xpx(ipoint));
-    Asub=Amod(j0-ind_range:j0+ind_range,i0-ind_range:i0+ind_range);
+    Asub=Amod(j0-ind_range_y:j0+ind_range_y,i0-ind_range_x:i0+ind_range_x);
     x_profile=sum(Asub,1);
     y_profile=sum(Asub,2);
@@ -1027 +1028 @@
     x_shift=0;
     y_shift=0;
-    if ind_x_max+2<=2*ind_range+1 && ind_x_max-2>=1
+    if ind_x_max+2<=2*ind_range_x+1 && ind_x_max-2>=1
         Atop=x_profile(ind_x_max-2:ind_x_max+2);
         x_shift=sum(Atop.*[-2 -1 0 1 2])/sum(Atop);
     end
-    if ind_y_max+2<=2*ind_range+1 && ind_y_max-2>=1
+    if ind_y_max+2<=2*ind_range_y+1 && ind_y_max-2>=1
         Atop=y_profile(ind_y_max-2:ind_y_max+2);
         y_shift=sum(Atop.*[-2 -1 0 1 2]')/sum(Atop);
     end
-    Delta(ipoint,1)=(x_shift+ind_x_max-ind_range-1)*Dx;%shift from the initial guess
-    Delta(ipoint,2)=(y_shift+ind_y_max-ind_range-1)*Dy;
+    Delta(ipoint,1)=(x_shift+ind_x_max-ind_range_x-1)*Dx;%shift from the initial guess
+    Delta(ipoint,2)=(y_shift+ind_y_max-ind_range_y-1)*Dy;
 end
 Tmod=T(:,(1:2))+Delta;
@@ -1078 +1079 @@
 end
 Tabchar=cell2tab(Coord,'    |    ');
-Tabchar=[Tabchar {'.....'}];
+Tabchar=[Tabchar; {'.....'}];
 %set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)