Changeset 196 for trunk/src

Timestamp:

Feb 20, 2011, 2:23:34 PM (13 years ago)

Author:

sommeria

Message:

bug corrections. Introduction of water wheight in calibration

File:

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

trunk/src/geometry_calib.m

@@ -209 +209 @@
 ZStart=Z_plane;
 ZEnd=Z_plane;
+volume_scan='n';
 if isfield(UvData,'XmlData')
     UvData.XmlData
     if isfield(UvData.XmlData,'TranslationMotor')
         NbSlice_j=UvData.XmlData.TranslationMotor.Nbslice;
-        ZStart=UvData.XmlData.TranslationMotor.ZStart;
-        ZEnd=UvData.XmlData.TranslationMotor.ZEnd;
+        ZStart=UvData.XmlData.TranslationMotor.ZStart/10;
+        ZEnd=UvData.XmlData.TranslationMotor.ZEnd/10;
+        volume_scan='y';
     end
 end
@@ -241 +243 @@
     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/10)} {num2str(ZStart/10)} {num2str(ZStart/10)} {'1.33'} num2str(NbSlice_j) {'y'} {'0'}];
+       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');
         %answer_1=msgbox_uvmat('INPUT_TXT',' Z= ',num2str(Z_plane)); 
@@ -251 +253 @@
             Z_plane=linspace(str2double(answer{1}),str2double(answer{2}),GeometryCalib.NbSlice);
         end     
-        GeometryCalib.SliceCoord=Z_plane'*[0 0 1]
+        GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
+        GeometryCalib.InterfaceCoord=[0 0 str2double(answer{3})];
+        GeometryCalib.RefractionIndex=str2double(answer{4});
     end
     errormsg=update_imadoc(GeometryCalib,outputfile);% introduce the calibration data in the xml file