From 5a0048b2d2128fe0e893b7d67e7570cf661e37fb Mon Sep 17 00:00:00 2001 From: iwasaki Date: Thu, 17 Dec 2015 20:35:06 +0900 Subject: [PATCH] measure the time --- test/vemTest/.Rakefile.un~ | Bin 636 -> 26255 bytes test/vemTest/.acqTest.rb.un~ | Bin 1826 -> 12674 bytes test/vemTest/Rakefile | 20 ++++++++-- test/vemTest/Rakefile~ | 23 ++++++----- test/vemTest/acqTest.rb | 11 +++--- test/vemTest/acqTest.rb~ | 11 +++--- test/vemTest/time.txt | 90 +++++++++++++++++++++++++++++++++++++++++++ vem/.feicontrol.rb.un~ | Bin 5152 -> 7831 bytes vem/feicontrol.rb | 4 +- vem/feicontrol.rb~ | 6 +-- 10 files changed, 135 insertions(+), 30 deletions(-) create mode 100644 test/vemTest/time.txt diff --git a/test/vemTest/.Rakefile.un~ b/test/vemTest/.Rakefile.un~ index 9f66b0637a10ca0b7926d0c577dea1cfb1723a9a..4d9442772a5ad4d27eb0f93e09f93bf109cf160b 100644 GIT binary patch literal 26255 zcmeI5O>9(E6o99tR7V8)Yxxo7^#^F73~d3?8Z|}|UFb@k4U$^R029+G%#1&Qq9HDf zCPoAW-KYtP8dqv!q8nG5NaDhcMBSJejjlDu#Kh?N?%XqT`Z_$y;_mKAUhkbZ@6DW? z@1FC{J@3A0u{`t6qm})$zveoBe*UM+pIz#G|KrEL*z(ogLzAa3{@we_gGWDk{LgjY zeAM&frd%%9Bb!QIIvui2_#L#m<%-oeFLd#4cW&}qe?X^iX?TkdaPpss+oL;Tdu$A#Irdb&=3W;{GqR^INv5WcPjXUnS90(4@kgXrsFa==;v6|;w zt<cTC%CwH=T(APi`878~4DnQZ^Nk5hI;MOlpZx ztzi1VV!}hHe1ODa0?R7dRCu4T7t4=ok)Um{dVaaZgoofwAOTa)VCmUo_3}(fGWY{B zlO8RM?;T0}B@0%oWmDlKoy5gRs8$Kq3cIbA9n)dVkHD@oQBZ(!g(=<=0h%5eK{=Cz z{3D=-vOsC74wkh>5s*bp#voz4f@vg;iAiqyk_8sKECOWBGE~eg!a~Z)LX-15EhapK zEIo}0EWJhv8OpvYsJY)gt0uUz0E|YH-p8&Jb=m0d_5_gT6JVppA0_r&nN~5Lb9;=gN@QHGz zQmz~+l%}SSCUbM%!vJ-&(G7@zi**iTlyF@EcRCB4EVD|16O76ZR;-0qfg|i(6*xvm zHA|>g*u9v=uD2~at$hIN7NZ&HRe%Vw&=u%B~L~Lr7P_1Bl*E*bf3}t^N<65`` z%K)#vfQ2r$-L_}}Rx%%_@ygtHyh0yJ@ zFu-jyiUJjo?p|fQyc^2|=?cg%vq1J;0c7hE>^Z`1$fyWYI410i9I--35sqJHaU8q? zN2x$8Knc2GqbyiK>B@r?)$ zO`!@&H<66t)L14+S4jSwMRMpWB%OmAoZuTZnt~RbE^&=Gjb(y#i`5IA4(HOw?<=Jp zbI0Ova&uHKln@*<%0f40s>UE;yYeHUjb9)1zgnl6s$M8FGF3>88||RTogI?gSjWK# zK}EBPQ8s) z{&-uDc$@o8<^F+_G6g)944kZ;>i3g)SlwpSgJX=8#voz4!tPWSyA4ftLhjBs{NT0E z=m<;r;kMEDFhWofelIMV-$WaJ@VdjO2uo&rIBw*J5rT^Fo3~Jz*&gOcK(I;tZ$S~Q zP@kPV+^VF3jQ>b*yKD$J-KCEgal(!jLW&@Ky`2lX2TLuB80Q;jgGc!BmG#h m*H^|3j?Q@Mlr4@Gj1W|0temk9j_HZhEeE%I77?|7`|y9nVg3yO delta 116 zcmeA_%lL;SB`h;{erTRc{!<2~HlH{zHkK3Wijo{+6Xpy5;^?g`^YF>aTif+~`ms$` qF$@e0oIs2W7=auR1_2lw%nvJ?aEk>Z5`SUhMB$C)%uGzrR{;P`nHvrO diff --git a/test/vemTest/.acqTest.rb.un~ b/test/vemTest/.acqTest.rb.un~ index d743b7d6cfaa6285423203ce8ac8a9b09b8747e2..15f50ee0924d2c9b9c150f6bf0b73503d0cc5bc2 100644 GIT binary patch literal 12674 zcmeI2O^g&p6vv1CV0T63Lj~ls=tXB1mSL6;Nj4!NM9^r^MB;iNo3VGcc4^s}S-N{! z5HR9N_ke&g_z^VmLgK-wF~NkGnCOXU^vunJ@#IBg^kVe?udX*!?7}kHVQ&4BH&s(z zRbBml{a#g9_fSy&_{GYT)n7AhH@5tto;u!hb;&<3eDm$=pZ~k&{p-U=KJ5MMwQIwB z&fa`wCX>l*hq|%|f7aLnrlOgl@SUCx9_`2!f3_9cY|4a(I_3X=5K|%rX?l+>Fce<+ z&fv&o{#uQ`JD_5IqF5Q~<5NMXm8Z+wru9fvEgjRbxBHxd#~STW5rW(%e^Pj2i3O%L zOQQWjr;iho2fQB*ytV{hKMv%fPea#2H!IbvUeY6n4YW%)E*v^{;Qao#^tl5&c0V!m z?4>W?{b}YJ>Mc=fRFA1xNAV8)-K!u64h;_0n&zX}598d?Y7`GDZ=zcACz$v8)nqk{ z2X__iLh}_~Gq0FJHm270I#bC||8qCv^o) zQJPCim71K2Bjwdju1eKPMVI2BT2ZX+q3%wpi#{S<8O>!+d-17B?G1XiHpb?aqj40( z;gt5yX8X{rCuxQT_(R#~jHIli$RF3{I&7X7(<`SM^{<-|5A4WQ7tFdd? zI+0*3$C^iy@eJ?X>qR<_gUWd1vEF*AC)XM3(xB=+%{FIwX&amhe(0AYoHOZ=motnS zx?W@730=A-_v)2Y3R8R&%&P`5W8?eMkNG3RB z4LzPm@lQ&OR%k*RA@-F^Y!gn_3l(Bptvk+%9X7J<>Q{w)VGn*)pCwBFTkMRPbU6;r zhAB}Rp&4m}=-2ZR9k>foJ4emsN{-#m(8-vi;Swd~N+UEQjc~m_AJ^K1JbRY6o?7E- z7aOk25@ipx%U%I7uY;PvoCaZQm4zm&(2%nqg;te3r%jU|3NQZRqUE!Kf=UqXHme=@ zt&On6b01WM=s49bV?m0GR%k*R!S%a~i%TIcG6$gKxh#2n!+N}k1@KrfZm|)QS%@N~ z5aDA`qD!&S2+c^%lIVo_J+?D?naRV;{&cZz#(~G7#MZ`2jZTcU0LsTR#iy3~V~Ryh zwD&_rh&}aCu|~6LBdGs&QPV>ev;d`tE}!k8IkVYDLUd$S%UF^m_W=J}AywWrW}7XI zwPKb9rZr2VeO9cBlum0bJQQA961jHIB&5(`XS(9AEk{kWjpUC{K!O;B;!WJi@ilr0qxC8(uP5kh1=#`knu zr4gDD*DIO79k|7_!6{Uf)ljk#dxwV-aZl@mL}wPUNGZgsplPs$5t^1pP%d>*insC1 zoHjd%%c3Hh zLZ00GqoxdLgl2>|OyEMw{Ouy=7Q?VTncTPqM2_2`WQaFi@)~d;H+TDnPam@9N^%cD zMM#zVt(`1L7caCzD+R06A=ewX;$&R72+2;ffny^l**xrwhTOQ*V*822p)EFIdITy$g!I-&S&(9*6@6AVW9aopPCFs`> z5*hbrMTnCK`KeUugfv1+1qeTw4`BmNNMeST9Vlt0VYH>x+|EJp%6tUx=!E;~ag@l+ ztYx~GMDA|f%*7kob6Xx-+VlYs+rC^ zd1, "exptime"=>1 } - end + end + + def acq_config( binning, exptime, size ) + @vem.acquisition_init( binning, exptime, size) + 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 + r.report "acq" do @image_array = @vem.acquisition end r.report "convert" do diff --git a/test/vemTest/acqTest.rb~ b/test/vemTest/acqTest.rb~ index 3d3ddf0..d395d61 100644 --- a/test/vemTest/acqTest.rb~ +++ b/test/vemTest/acqTest.rb~ @@ -25,15 +25,16 @@ class AcqTest "binning"=>1, "exptime"=>1 } - end + end + + def acq_config( binning, exptime, size ) + @vem.acquisition_init( binning, exptime, size) + 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 + r.report "acq" do @image_array = @vem.acquisition end r.report "convert" do diff --git a/test/vemTest/time.txt b/test/vemTest/time.txt new file mode 100644 index 0000000..899eda8 --- /dev/null +++ b/test/vemTest/time.txt @@ -0,0 +1,90 @@ +bin:1 size:0 + user system total real +acq 1.687000 0.031000 1.718000 ( 6.703125) +convert 29.719000 0.000000 29.719000 ( 29.796875) + user system total real +acq 1.687000 0.047000 1.734000 ( 9.046875) +convert 29.672000 0.000000 29.672000 ( 29.750000) + user system total real +acq 1.672000 0.031000 1.703000 ( 12.703125) +convert 29.672000 0.031000 29.703000 ( 29.750000) +bin:1 size:1 + user system total real +acq 0.406000 0.016000 0.422000 ( 9.640625) +convert 2.297000 0.000000 2.297000 ( 2.296875) + user system total real +acq 0.422000 0.000000 0.422000 ( 11.890625) +convert 2.281000 0.016000 2.297000 ( 2.296875) + user system total real +acq 0.375000 0.031000 0.406000 ( 14.203125) +convert 2.297000 0.000000 2.297000 ( 2.296875) +bin:1 size:2 + user system total real +acq 0.094000 0.015000 0.109000 ( 13.296875) +convert 0.265000 0.000000 0.265000 ( 0.265625) + user system total real +acq 0.094000 0.016000 0.110000 ( 15.125000) +convert 0.281000 0.000000 0.281000 ( 0.281250) + user system total real +acq 0.109000 0.000000 0.109000 ( 17.015625) +convert 0.250000 0.016000 0.266000 ( 0.265625) +bin:2 size:0 + user system total real +acq 0.438000 0.000000 0.438000 ( 19.109375) +convert 2.281000 0.000000 2.281000 ( 2.312500) + user system total real +acq 0.438000 0.015000 0.453000 ( 19.609375) +convert 2.265000 0.016000 2.281000 ( 2.296875) + user system total real +acq 0.422000 0.016000 0.438000 ( 21.687500) +convert 2.281000 0.000000 2.281000 ( 2.296875) +bin:2 size:1 + user system total real +acq 0.094000 0.000000 0.094000 ( 17.921875) +convert 0.297000 0.000000 0.297000 ( 0.296875) + user system total real +acq 0.094000 0.015000 0.109000 ( 19.281250) +convert 0.265000 0.016000 0.281000 ( 0.281250) + user system total real +acq 0.094000 0.015000 0.109000 ( 20.625000) +convert 0.297000 0.000000 0.297000 ( 0.296875) +bin:2 size:2 + user system total real +acq 0.031000 0.000000 0.031000 ( 19.796875) +convert 0.063000 0.000000 0.063000 ( 0.062500) + user system total real +acq 0.015000 0.000000 0.015000 ( 21.031250) +convert 0.063000 0.000000 0.063000 ( 0.062500) + user system total real +acq 0.031000 0.016000 0.047000 ( 22.265625) +convert 0.063000 0.000000 0.063000 ( 0.062500) +bin:4 size:0 + user system total real +acq 0.125000 0.000000 0.125000 ( 24.562500) +convert 0.281000 0.000000 0.281000 ( 0.281250) + user system total real +acq 0.094000 0.000000 0.094000 ( 24.531250) +convert 0.281000 0.000000 0.281000 ( 0.281250) + user system total real +acq 0.094000 0.016000 0.110000 ( 25.765625) +convert 0.265000 0.000000 0.265000 ( 0.281250) +bin:4 size:1 + user system total real +acq 0.032000 0.000000 0.032000 ( 24.421875) +convert 0.046000 0.000000 0.046000 ( 0.046875) + user system total real +acq 0.016000 0.000000 0.016000 ( 25.531250) +convert 0.063000 0.000000 0.063000 ( 0.062500) + user system total real +acq 0.015000 0.000000 0.015000 ( 26.625000) +convert 0.063000 0.000000 0.063000 ( 0.062500) +bin:4 size:2 + user system total real +acq 0.015000 0.000000 0.015000 ( 28.718750) +convert 0.016000 0.000000 0.016000 ( 0.015625) + user system total real +acq 0.000000 0.015000 0.015000 ( 27.562500) +convert 0.016000 0.000000 0.016000 ( 0.015625) + user system total real +acq 0.015000 0.000000 0.015000 ( 28.593750) +convert 0.016000 0.000000 0.016000 ( 0.015625) diff --git a/vem/.feicontrol.rb.un~ b/vem/.feicontrol.rb.un~ index 16d2256697a5795af216fe19baf47f1fb9dbb9bc..f3425cbe28664dbb08ac27a83498053bd9db2fbf 100644 GIT binary patch delta 818 zcma))OD_aL5XXBagz;E|EaG6xT9!lviIX_UvIz+%T$#`-y=!LI7>|fIH{mi8M=mZ7 z64{Fb2cLis;3Dz(1n#POW?~VEO8zt5|LOi!b=RD?pAHyP!aSR_hO)0reb}$nuey7B z_rrI4i^);zHuBOqKK6ET!$SJgaqNIGc8Dqr1t+?1&^r*DvQHvK^i{ilNK`8o`P!Ot zwQ>3poibDN$n=BoF^P0_rFjBRTwPde3w`#N5~g0$ za?8#VM3ciKAS~esV?nI*s81(aaFeu)GJVkpkzOO|rCyOg>A|@R3nUC7TTyEMUL97b z&@iH!Buev8RAj5$912GqZu-?wkAk49q+X?eUtf-TwC%1Go?GBj6Gh#ibGK<)3mCJD z%fjYhSRhPeoE)4L$tst!Lc%f4;^5Rr(o3<4xdh? z#R5k&rU9gI2m_GBS64R2t@gMhOy1?JIq^=28}SZYM^OyGtvPS}-vaw~-!DG_9$}1s delta 117 zcmbPkyFf!fEHih0Xr4>{QwFA&R!8IiT```X!l`*SsYBt1dBX`$`Ae6W*2V~VuHKiu zh=GBjce0Ieksgpy0mN)T%m~C>KnwyP8ipCdiY79$fMnS=COQi;GHhNd$j!v`d=&t> C$Q~{L diff --git a/vem/feicontrol.rb b/vem/feicontrol.rb index 5e69fbd..7afbd16 100644 --- a/vem/feicontrol.rb +++ b/vem/feicontrol.rb @@ -33,10 +33,7 @@ class FEIControl < VEM @@acq = nil def initialize - puts "FEI initialize" - @@tem = TEMObject.instance - puts @@tem end def get_params @@ -122,6 +119,7 @@ class FEIControl < VEM def acquisition @@tem = TEMObject.instance + @@acq = @@tem.Acquisition # acquisition Image imageCollection = @@acq.AcquireImages diff --git a/vem/feicontrol.rb~ b/vem/feicontrol.rb~ index 768379b..2662f57 100644 --- a/vem/feicontrol.rb~ +++ b/vem/feicontrol.rb~ @@ -33,8 +33,6 @@ class FEIControl < VEM @@acq = nil def initialize - puts "FEI initialize" - @@tem = TEMObject.instance puts @@tem end @@ -99,7 +97,6 @@ class FEIControl < VEM end def acquisition_init(binning, exp_time, image_size) - puts "acq_init" @@tem = TEMObject.instance @@ -118,11 +115,12 @@ 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 @@tem = TEMObject.instance + @@acq = @@tem.Acquisition # acquisition Image imageCollection = @@acq.AcquireImages -- 2.11.0