commit by fei

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

diff --git a/vem/feicontrol.rb~ b/vem/feicontrol.rb~
index c04419c..00e2166 100644 (file)
--- a/vem/feicontrol.rb~
+++ b/vem/feicontrol.rb~
@@ -36,7 +36,7 @@ class FEIControl < VEM
                        :proj => {
                                :magIndex => 0,
                                :mag => 0,
-                               :imageShift => {:x => 0, :y => 0},
+                               :imageBeamShift => {:x => 0, :y => 0},
                                :focus => 0,
                                :defocus => 0,
                                :objStg => {:x => 0, :y => 0}
@@ -58,7 +58,15 @@ class FEIControl < VEM
                @@params[:stage][:a] = @@tem.Stage.Position.A
                @@params[:ill][:spotSizeIndex] = @@tem.Illumination.SpotsizeIndex
                @@params[:proj][:magIndex] = @@tem.Projection.MagnificationIndex
+<<<<<<< HEAD
                @@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
+>>>>>>> c40fae8a2f64d018688751e591cc90330dfd6f6c
                #       @@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
                #       @@params[:ccdCamera][:expTime]  = ccdCamerasAcqParams.ExposureTime
                #       @@params[:ccdCamera][:imageSize] = ccdCamerasAcqParams.ImageSize
@@ -144,7 +152,7 @@ class FEIControl < VEM
                return @@params[:proj].to_json
        end
 
-       def set_image_beam_shift(x, y)
+       def set_image_beamshift(x, y)
                puts "FEI setImageShift"
 
                proj = @@tem.Projection
@@ -255,7 +263,7 @@ class FEIControl < VEM
 
        def get_vacuum_status
                puts "FEI getVacuumStatus"
-               puts @@tem.Vacuum.Gauges.Item(4).Name
+               puts @@tem.Vacuum.Gauges.Item(5).Name
                puts @@tem.Vacuum.Gauges.Item(1).Pressure
        end