mkdir vemTest

diff --git a/test/vemTest/.Rakefile.un~ b/test/vemTest/.Rakefile.un~
new file mode 100644 (file)
index 0000000..9f66b06
Binary files /dev/null and b/test/vemTest/.Rakefile.un~ differ

diff --git a/test/vemTest/.acqTest.rb.un~ b/test/vemTest/.acqTest.rb.un~
new file mode 100644 (file)
index 0000000..d743b7d
Binary files /dev/null and b/test/vemTest/.acqTest.rb.un~ differ

diff --git a/test/vemTest/Rakefile b/test/vemTest/Rakefile
new file mode 100644 (file)
index 0000000..6aae128
--- /dev/null
+++ b/test/vemTest/Rakefile
@@ -0,0 +1,9 @@
+require "./acqTest"
+
+task :test1, [:em] do |t, args|
+  puts args.em
+  acq_test = AcqTest.new(args.em)
+  acq_test.test1
+end
+
+

diff --git a/test/vemTest/Rakefile~ b/test/vemTest/Rakefile~
new file mode 100644 (file)
index 0000000..9334465
--- /dev/null
+++ b/test/vemTest/Rakefile~
@@ -0,0 +1,13 @@
+require "./acqTest"
+
+task :test1, [:em] do |t, args|
+  puts args.em
+  acq_test = AcqTest.new(args.em)
+  acq_test.test1
+end
+
+task :test2, [:em] do |t, args|
+  puts args.em
+  acq_test = AcqTest.new(args.em)
+  acq_test.test2
+end

diff --git a/test/vemTest/acqTest.rb b/test/vemTest/acqTest.rb
new file mode 100644 (file)
index 0000000..3d3ddf0
--- /dev/null
+++ b/test/vemTest/acqTest.rb
@@ -0,0 +1,46 @@
+### load ########################
+
+require "json"
+require "benchmark"
+require "../../vem/vem"
+require "../../vem/mock"
+require "../../tool/imageProc"
+
+# FEIのPCのみ使用可能
+begin
+  require "../../vem/feicontrol"
+rescue LoadError
+end
+
+#################################
+
+class AcqTest
+  include ImageProc
+
+  def initialize(inst)
+    @vem = VEM.create(inst)
+    @image_array = nil
+    @params = {
+      "size"=>0,
+      "binning"=>1,
+      "exptime"=>1
+    }
+  end   
+
+  # 撮影設定・撮影・256階調変換
+  def test1
+    Benchmark.bm 10 do |r| 
+      r.report "acq_init" do 
+        @vem.acquisition_init( 4, 0.07, 0 )
+      end
+      r.report "acq" do
+        @image_array = @vem.acquisition
+      end
+      r.report "convert" do
+        converted_image = convert_256(@image_array)
+      end
+    end
+  end
+
+end
+

diff --git a/test/vemTest/acqTest.rb~ b/test/vemTest/acqTest.rb~
new file mode 100644 (file)
index 0000000..3d3ddf0
--- /dev/null
+++ b/test/vemTest/acqTest.rb~
@@ -0,0 +1,46 @@
+### load ########################
+
+require "json"
+require "benchmark"
+require "../../vem/vem"
+require "../../vem/mock"
+require "../../tool/imageProc"
+
+# FEIのPCのみ使用可能
+begin
+  require "../../vem/feicontrol"
+rescue LoadError
+end
+
+#################################
+
+class AcqTest
+  include ImageProc
+
+  def initialize(inst)
+    @vem = VEM.create(inst)
+    @image_array = nil
+    @params = {
+      "size"=>0,
+      "binning"=>1,
+      "exptime"=>1
+    }
+  end   
+
+  # 撮影設定・撮影・256階調変換
+  def test1
+    Benchmark.bm 10 do |r| 
+      r.report "acq_init" do 
+        @vem.acquisition_init( 4, 0.07, 0 )
+      end
+      r.report "acq" do
+        @image_array = @vem.acquisition
+      end
+      r.report "convert" do
+        converted_image = convert_256(@image_array)
+      end
+    end
+  end
+
+end
+

diff --git a/vem/.feicontrol.rb.un~ b/vem/.feicontrol.rb.un~
index 998e993..16d2256 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 768379b..5e69fbd 100644 (file)
--- a/vem/feicontrol.rb
+++ b/vem/feicontrol.rb
@@ -99,7 +99,6 @@ class FEIControl < VEM
        end
 
        def acquisition_init(binning, exp_time, image_size)
-               puts "acq_init"
 
                @@tem = TEMObject.instance
 
@@ -118,7 +117,7 @@ class FEIControl < VEM
                ccdCamerasAcqParams.ExposureTime = exp_time
                # imagesize
                ccdCamerasAcqParams.ImageSize = image_size
-               puts "#{ccdCamerasAcqParams.Binning}, #{ccdCamerasAcqParams.ExposureTime}, #{ccdCamerasAcqParams.ImageSize}"
+               return "#{ccdCamerasAcqParams.Binning}, #{ccdCamerasAcqParams.ExposureTime}, #{ccdCamerasAcqParams.ImageSize}"
        end
 
        def acquisition

diff --git a/vem/feicontrol.rb~ b/vem/feicontrol.rb~
index 4dc6a5d..768379b 100644 (file)
--- a/vem/feicontrol.rb~
+++ b/vem/feicontrol.rb~
@@ -118,7 +118,7 @@ class FEIControl < VEM
                ccdCamerasAcqParams.ExposureTime = exp_time
                # imagesize
                ccdCamerasAcqParams.ImageSize = image_size
-               puts "#{ccdCamerasAcqParams.Binning}, #{ccdCamerasAcqParams.ExposureTime}, #{ccdCamerasAcqParams.image_size}"
+               puts "#{ccdCamerasAcqParams.Binning}, #{ccdCamerasAcqParams.ExposureTime}, #{ccdCamerasAcqParams.ImageSize}"
        end
 
        def acquisition