From b3a2d260640edd3ae1b79fe9eb71b17f1418a646 Mon Sep 17 00:00:00 2001 From: koennecke Date: Fri, 23 Feb 2007 14:32:56 +0000 Subject: [PATCH] - Restore in amor.tcl --- test/DataNumber | 2 +- test/nxscripttest.tcl | 11 +++++++++++ test/test.dic | 1 + test/testini.tcl | 4 +++- test/testsics | 20 ++++++++++---------- test/testsoll.xml | 9 +++++++-- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/test/DataNumber b/test/DataNumber index 00a6883b..4556e033 100644 --- a/test/DataNumber +++ b/test/DataNumber @@ -1,3 +1,3 @@ - 75 + 83 NEVER, EVER modify or delete this file You'll risk eternal damnation and a reincarnation as a cockroach!|n \ No newline at end of file diff --git a/test/nxscripttest.tcl b/test/nxscripttest.tcl index 6421d087..6bcf28b4 100644 --- a/test/nxscripttest.tcl +++ b/test/nxscripttest.tcl @@ -89,6 +89,17 @@ test nxscript-1.13 {Writing sicsdata } -body { testNoError "nxscript putsicsdata testsd data" } -result OK +test nxscript-1.14 {Writing slabs } -body { + data clear + data putfloat 0 1.1 + testNoError "nxscript putslab testslab [list 0] [list 1] data" + data putfloat 0 2.2 + testNoError "nxscript putslab testslab [list 1] [list 1] data" + data putfloat 0 3.3 + testNoError "nxscript putslab testslab [list 2] [list 1] data" +} -result OK + + test nxscript-1.20 {Close file} -body { testOK "nxscript close" } -result OK diff --git a/test/test.dic b/test/test.dic index 34616f05..433bcee4 100644 --- a/test/test.dic +++ b/test/test.dic @@ -24,6 +24,7 @@ testar=/entry1,NXentry/detector,NXdata/SDS x_axis testintar=/entry1,NXentry/detector,NXdata/SDS y_axis -type NX_INT32 testsd=/entry1,NXentry/detector,NXdata/SDS gurke -rank 1 \ -type NX_INT32 -dim {$(dim0)} +testslab=/entry,NXentry/SDS slappy -rank 1 -dim {-1} testlink=/entry1,NXentry/detector,NXdata/NXVGROUP diff --git a/test/testini.tcl b/test/testini.tcl index d87dfc6a..be1af806 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -193,4 +193,6 @@ hattach /instrument/sample a3 omega hattach /instrument/sample qh qh hmake /instrument/detector spy none hattach /instrument/detector hm data -hattach /instrument lotte title \ No newline at end of file +hattach /instrument lotte title + +restore diff --git a/test/testsics b/test/testsics index 5fabdb39..f3e2ea0b 100755 --- a/test/testsics +++ b/test/testsics @@ -18,41 +18,41 @@ source testutil.tcl source sicstcldebug.tcl #--------------- Test Miscellaneous stuff -source testmisc.tcl +#source testmisc.tcl #-------------- Test for motors -source mottest.tcl +#source mottest.tcl #-------------- Test Counter set countername aba set errorname aba -source countertest.tcl +#source countertest.tcl #-------------- Test Multi Counter set countername multi -source countertest.tcl +#source countertest.tcl #-------------- Test batch processing -source batchtest.tcl +#source batchtest.tcl #-------------- Test scans -source scantest.tcl +#source scantest.tcl #------------ Test peak optimization -source optitest.tcl +#source optitest.tcl #----------- test histogram memory -source histtest.tcl +#source histtest.tcl #----------- test sics data -source testsicsdata.tcl +#source testsicsdata.tcl #----------- test nxscript source nxscripttest.tcl #------------ test SANS MultiMotor -source testmumo.tcl +#source testmumo.tcl #------------ print test summary cleanupTests diff --git a/test/testsoll.xml b/test/testsoll.xml index 3d0c0638..9a91e331 100644 --- a/test/testsoll.xml +++ b/test/testsoll.xml @@ -1,6 +1,6 @@ +file_time="2007-02-21 10:51:15+0100" Instrument="Washmaschine"> Hugo ist eine Nassnase @@ -40,7 +40,7 @@ file_time="2006-11-08 14:30:21+0100" Instrument="Washmaschine" signal="1"> - + 55 55 55 55 55 55 55 55 55 55 55 55 @@ -76,4 +76,9 @@ file_time="2006-11-08 14:30:21+0100" Instrument="Washmaschine" signal="1"> + + + 1.1000 2.2000 3.3000 + +