OSDN Git Service
(root)
/
vem
/
vem.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c69a804
)
commit by fei
author
iwasaki
<iwaaya@yasunaga-lab.bio.kyutech.ac.jp>
Thu, 28 Jan 2016 15:58:57 +0000
(
00:58
+0900)
committer
iwasaki
<iwaaya@yasunaga-lab.bio.kyutech.ac.jp>
Thu, 28 Jan 2016 15:58:57 +0000
(
00:58
+0900)
vem/.feicontrol.rb.un~
patch
|
blob
|
history
vem/.test.rb.un~
patch
|
blob
|
history
vem/feicontrol.rb
patch
|
blob
|
history
vem/feicontrol.rb~
patch
|
blob
|
history
vem/test.rb
patch
|
blob
|
history
vem/test.rb~
patch
|
blob
|
history
vemserver/.config.rb.un~
patch
|
blob
|
history
vemserver/config.rb
patch
|
blob
|
history
vemserver/config.rb~
patch
|
blob
|
history
diff --git
a/vem/.feicontrol.rb.un~
b/vem/.feicontrol.rb.un~
index
eaf5bb4
..
4a740ae
100644
(file)
Binary files a/vem/.feicontrol.rb.un~ and b/vem/.feicontrol.rb.un~ differ
diff --git
a/vem/.test.rb.un~
b/vem/.test.rb.un~
index
9d5afca
..
22098b2
100644
(file)
Binary files a/vem/.test.rb.un~ and b/vem/.test.rb.un~ differ
diff --git
a/vem/feicontrol.rb
b/vem/feicontrol.rb
index
4f707f3
..
d923c63
100644
(file)
--- a/
vem/feicontrol.rb
+++ b/
vem/feicontrol.rb
@@
-227,6
+227,8
@@
class FEIControl < VEM
ccdCamerasAcqParams.ExposureTime = exp_time
# imagesize
ccdCamerasAcqParams.ImageSize = image_size
ccdCamerasAcqParams.ExposureTime = exp_time
# imagesize
ccdCamerasAcqParams.ImageSize = image_size
+ # image correction
+ # ccdCamerasAcqParams.ImageCorrection = 1
@@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
@@params[:ccdCamera][:expTime] = ccdCamerasAcqParams.ExposureTime
@@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
@@params[:ccdCamera][:expTime] = ccdCamerasAcqParams.ExposureTime
@@
-251,5
+253,11
@@
class FEIControl < VEM
puts "FEI setBeamTilt"
end
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
end
diff --git
a/vem/feicontrol.rb~
b/vem/feicontrol.rb~
index
be38726
..
c04419c
100644
(file)
--- a/
vem/feicontrol.rb~
+++ b/
vem/feicontrol.rb~
@@
-181,7
+181,7
@@
class FEIControl < VEM
proj = @@tem.Projection
proj.ResetDefocus
proj = @@tem.Projection
proj.ResetDefocus
- @@params[:proj][:defocus] = proj.Defocus
+ @@params[:proj][:defocus] = proj.Defocus
*1000000000
return @@params[:proj][:defocus].to_json
end
return @@params[:proj][:defocus].to_json
end
@@
-227,6
+227,8
@@
class FEIControl < VEM
ccdCamerasAcqParams.ExposureTime = exp_time
# imagesize
ccdCamerasAcqParams.ImageSize = image_size
ccdCamerasAcqParams.ExposureTime = exp_time
# imagesize
ccdCamerasAcqParams.ImageSize = image_size
+ # image correction
+ # ccdCamerasAcqParams.ImageCorrection = 1
@@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
@@params[:ccdCamera][:expTime] = ccdCamerasAcqParams.ExposureTime
@@params[:ccdCamera][:binning] = ccdCamerasAcqParams.Binning
@@params[:ccdCamera][:expTime] = ccdCamerasAcqParams.ExposureTime
@@
-251,5
+253,11
@@
class FEIControl < VEM
puts "FEI setBeamTilt"
end
puts "FEI setBeamTilt"
end
+ def get_vacuum_status
+ puts "FEI getVacuumStatus"
+ puts @@tem.Vacuum.Gauges.Item(4).Name
+ puts @@tem.Vacuum.Gauges.Item(1).Pressure
+ end
+
end
end
diff --git
a/vem/test.rb
b/vem/test.rb
index
9200700
..
a7b502d
100644
(file)
--- a/
vem/test.rb
+++ b/
vem/test.rb
@@
-4,6
+4,7
@@
require "./feicontrol"
rescue LoadError
end
require "./mock"
rescue LoadError
end
require "./mock"
+require "benchmark"
class TEST
def initialize
class TEST
def initialize
@@
-66,6
+67,10
@@
class TEST
def test_acq
@@vem.acquisition
end
def test_acq
@@vem.acquisition
end
+
+ def test_get_vacuum_status
+ @@vem.get_vacuum_status
+ end
end
test = TEST.new
end
test = TEST.new
@@
-78,9
+83,6
@@
test.test_set_spotsizeR
test.test_acq_init
test.test_acq
=end
test.test_acq_init
test.test_acq
=end
-test.test_acq_init
-test.test_acq
-
#test.test_set_magnificationR
#test.test_set_image_beam_shift
#test.test_set_focus
#test.test_set_magnificationR
#test.test_set_image_beam_shift
#test.test_set_focus
@@
-88,3
+90,4
@@
test.test_acq
#test.test_set_reset_defocus
#test.test_set_condenser_stg
#test.test_set_object_stg
#test.test_set_reset_defocus
#test.test_set_condenser_stg
#test.test_set_object_stg
+test.test_get_vacuum_status
diff --git
a/vem/test.rb~
b/vem/test.rb~
index
264a75b
..
79abde2
100644
(file)
--- a/
vem/test.rb~
+++ b/
vem/test.rb~
@@
-4,6
+4,7
@@
require "./feicontrol"
rescue LoadError
end
require "./mock"
rescue LoadError
end
require "./mock"
+require "benchmark"
class TEST
def initialize
class TEST
def initialize
@@
-78,8
+79,11
@@
test.test_set_spotsizeR
test.test_acq_init
test.test_acq
=end
test.test_acq_init
test.test_acq
=end
-
+test.test_acq_init
+result = Benchmark.realtime do
test.test_acq
test.test_acq
+end
+puts result
#test.test_set_magnificationR
#test.test_set_image_beam_shift
#test.test_set_magnificationR
#test.test_set_image_beam_shift
diff --git
a/vemserver/.config.rb.un~
b/vemserver/.config.rb.un~
index
88876cb
..
90657d4
100644
(file)
Binary files a/vemserver/.config.rb.un~ and b/vemserver/.config.rb.un~ differ
diff --git
a/vemserver/config.rb
b/vemserver/config.rb
index
3cdec1b
..
eb952bb
100644
(file)
--- a/
vemserver/config.rb
+++ b/
vemserver/config.rb
@@
-1,8
+1,8
@@
$:.unshift(File.dirname(__FILE__))
$:.unshift(File.dirname(__FILE__))
-$ip_address = '
localhost
'
+$ip_address = '
192.168.4.146
'
$cs_port = '3000'
$vemapi_port = 9090
$debug = true
$cs_port = '3000'
$vemapi_port = 9090
$debug = true
-$em_name = '
mock
'
+$em_name = '
fei
'
diff --git
a/vemserver/config.rb~
b/vemserver/config.rb~
index
1ca54c5
..
3cdec1b
100644
(file)
--- a/
vemserver/config.rb~
+++ b/
vemserver/config.rb~
@@
-1,8
+1,8
@@
$:.unshift(File.dirname(__FILE__))
$ip_address = 'localhost'
$:.unshift(File.dirname(__FILE__))
$ip_address = 'localhost'
-$cs_port = '
192.168.4.146
'
+$cs_port = '
3000
'
$vemapi_port = 9090
$debug = true
$vemapi_port = 9090
$debug = true
-$em_name = '
fei
'
+$em_name = '
mock
'