fix by fei

diff --git a/vem/.feicontrol.rb.un~ b/vem/.feicontrol.rb.un~
index 55fcb70..eaf5bb4 100644 (file)
Binary files a/vem/.feicontrol.rb.un~ and b/vem/.feicontrol.rb.un~ differ

diff --git a/vem/feicontrol.rb b/vem/feicontrol.rb
index 3653041..4f707f3 100644 (file)
--- a/vem/feicontrol.rb
+++ b/vem/feicontrol.rb
@@ -58,6 +58,7 @@ 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[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
                #       @@params[:ccdCamera][:expTime]  = ccdCamerasAcqParams.ExposureTime
                #       @@params[:ccdCamera][:imageSize] = ccdCamerasAcqParams.ImageSize
@@ -171,7 +172,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
 
@@ -180,7 +181,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
 

diff --git a/vem/feicontrol.rb~ b/vem/feicontrol.rb~
index 2364aed..be38726 100644 (file)
--- a/vem/feicontrol.rb~
+++ b/vem/feicontrol.rb~
@@ -58,6 +58,7 @@ 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[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
                #       @@params[:ccdCamera][:expTime]  = ccdCamerasAcqParams.ExposureTime
                #       @@params[:ccdCamera][:imageSize] = ccdCamerasAcqParams.ImageSize
@@ -171,7 +172,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
 
@@ -239,7 +240,6 @@ class FEIControl < VEM
                # acquisition Image
                imageCollection = @@acq.AcquireImages
                img     = imageCollection.Item(0)
-       puts img
                return img.AsSafeArray
        end