Changeset 213 for trunk/src/geometry_calib.m

Timestamp:

Mar 4, 2011, 12:07:38 AM (14 years ago)

Author:

sommeria

Message:

bug corrected for 3D geometry calib: tilt angles

File:

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

trunk/src/geometry_calib.m

@@ -242 +242 @@
 if strcmp(answer,'Yes')
     if strcmp(calib_cell{val}(1:2),'3D')%set the plane position for 3D (projection) calibration
-       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle'};
-       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.33'} num2str(NbSlice_j) {volume_scan} {'0'}];
-        answer=inputdlg(input_key,'slice position(s)',ones(1,7), input_val,'on');
+       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle y axis','tilt angle x axis'};
+       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.333'} num2str(NbSlice_j) {volume_scan} {'0'} {'0'}];
+        answer=inputdlg(input_key,'slice position(s)',ones(1,8), input_val,'on');
         %answer_1=msgbox_uvmat('INPUT_TXT',' Z= ',num2str(Z_plane)); 
         GeometryCalib.NbSlice=str2double(answer{5});
@@ -254 +254 @@
         end     
         GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
-        GeometryCalib.SliceAngle=answer{7}*ones(GeometryCalib.NbSlice,1)*[0 1 0];%rotation around y axis (to generalise)
+        GeometryCalib.SliceAngle(:,3)=0;
+        GeometryCalib.SliceAngle(:,2)=str2double(answer{7})*ones(GeometryCalib.NbSlice,1);%rotation around y axis (to generalise)
+        GeometryCalib.SliceAngle(:,1)=str2double(answer{8})*ones(GeometryCalib.NbSlice,1);%rotation around x axis (to generalise)
         GeometryCalib.InterfaceCoord=[0 0 str2double(answer{3})];
         GeometryCalib.RefractionIndex=str2double(answer{4});