commit by fei

[vem/vem.git] / vem / feicontrol.rb

diff --git a/vem/feicontrol.rb b/vem/feicontrol.rb
index 96b2ae8..36334bc 100644 (file)
--- a/vem/feicontrol.rb
+++ b/vem/feicontrol.rb
@@ -58,11 +58,11 @@ class FEIControl < VEM
                @@params[:stage][:a] = @@tem.Stage.Position.A
                @@params[:ill][:spotSizeIndex] = @@tem.Illumination.SpotsizeIndex
                @@params[:proj][:magIndex] = @@tem.Projection.MagnificationIndex
+               @@params[:proj][:defocus] = @@tem.Projection.Defocus*1000000000
     @@params[:proj][:mag] = @@tem.Projection.Magnification
     @@params[:proj][:imageBeamShift][:x] = @@tem.Projection.ImageBeamShift.x
     @@params[:proj][:imageBeamShift][:y] = @@tem.Projection.ImageBeamShift.y
     @@params[:proj][:focus] = @@tem.Projection.Focus
-    @@params[:proj][:defocus] = @@tem.Projection.Defocus
                #       @@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
                #       @@params[:ccdCamera][:expTime]  = ccdCamerasAcqParams.ExposureTime
                #       @@params[:ccdCamera][:imageSize] = ccdCamerasAcqParams.ImageSize
@@ -176,7 +176,7 @@ class FEIControl < VEM
 
                proj = @@tem.Projection
                proj.Defocus = proj.Defocus + params*1e-9
-               @@params[:proj][:defocus] = proj.Defocus
+               @@params[:proj][:defocus] = proj.Defocus*1000000000
                return @@params[:proj][:defocus].to_json
        end
 
@@ -185,7 +185,7 @@ class FEIControl < VEM
 
                proj = @@tem.Projection
                proj.ResetDefocus
-               @@params[:proj][:defocus] = proj.Defocus
+               @@params[:proj][:defocus] = proj.Defocus*1000000000
                return @@params[:proj][:defocus].to_json
        end
 
@@ -231,6 +231,8 @@ class FEIControl < VEM
                ccdCamerasAcqParams.ExposureTime = exp_time
                # imagesize
                ccdCamerasAcqParams.ImageSize = image_size
+               # image correction
+               # ccdCamerasAcqParams.ImageCorrection = 1 
 
                @@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
                @@params[:ccdCamera][:expTime]  = ccdCamerasAcqParams.ExposureTime
@@ -255,5 +257,11 @@ class FEIControl < VEM
                puts "FEI setBeamTilt"
        end
 
+       def get_vacuum_status
+               puts "FEI getVacuumStatus"
+               puts @@tem.Vacuum.Gauges.Item(5).Name
+               puts @@tem.Vacuum.Gauges.Item(1).Pressure
+       end
+
 end