Ignore:
Timestamp:
Feb 20, 2011, 2:23:34 PM (10 years ago)
Author:
sommeria
Message:

bug corrections. Introduction of water wheight in calibration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/geometry_calib.m

    r191 r196  
    209209ZStart=Z_plane;
    210210ZEnd=Z_plane;
     211volume_scan='n';
    211212if isfield(UvData,'XmlData')
    212213    UvData.XmlData
    213214    if isfield(UvData.XmlData,'TranslationMotor')
    214215        NbSlice_j=UvData.XmlData.TranslationMotor.Nbslice;
    215         ZStart=UvData.XmlData.TranslationMotor.ZStart;
    216         ZEnd=UvData.XmlData.TranslationMotor.ZEnd;
     216        ZStart=UvData.XmlData.TranslationMotor.ZStart/10;
     217        ZEnd=UvData.XmlData.TranslationMotor.ZEnd/10;
     218        volume_scan='y';
    217219    end
    218220end
     
    241243    if strcmp(calib_cell{val}(1:2),'3D')%set the plane position for 3D (projection) calibration
    242244       input_key={'Z (first position)','Z (last position)','Z (water surface)', 'refractive index','NbSlice','volume scan (y/n)','tilt angle'};
    243        input_val=[{num2str(ZEnd/10)} {num2str(ZStart/10)} {num2str(ZStart/10)} {'1.33'} num2str(NbSlice_j) {'y'} {'0'}];
     245       input_val=[{num2str(ZEnd)} {num2str(ZStart)} {num2str(ZStart)} {'1.33'} num2str(NbSlice_j) {volume_scan} {'0'}];
    244246        answer=inputdlg(input_key,'slice position(s)',ones(1,7), input_val,'on');
    245247        %answer_1=msgbox_uvmat('INPUT_TXT',' Z= ',num2str(Z_plane));
     
    251253            Z_plane=linspace(str2double(answer{1}),str2double(answer{2}),GeometryCalib.NbSlice);
    252254        end     
    253         GeometryCalib.SliceCoord=Z_plane'*[0 0 1]
     255        GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
     256        GeometryCalib.InterfaceCoord=[0 0 str2double(answer{3})];
     257        GeometryCalib.RefractionIndex=str2double(answer{4});
    254258    end
    255259    errormsg=update_imadoc(GeometryCalib,outputfile);% introduce the calibration data in the xml file
Note: See TracChangeset for help on using the changeset viewer.