diff --git a/test/DataNumber b/test/DataNumber index 10d06faf..00a6883b 100644 --- a/test/DataNumber +++ b/test/DataNumber @@ -1,3 +1,3 @@ - 52 + 75 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/sicsstat.tcl b/test/sicsstat.tcl index 3a5b7d91..f9c6d419 100644 --- a/test/sicsstat.tcl +++ b/test/sicsstat.tcl @@ -1,6 +1,6 @@ exe batchpath ./ exe syspath ./ -lotte UNKNOWN +lotte Wuergehals was here lotte setAccess 2 # Motor brumm brumm sign 1.000000 @@ -155,7 +155,9 @@ tasub const kf tasub ss -1 tasub setub -0.100503 -0.000000 -0.000000 0.000000 -0.000000 -0.044964 0.000000 -0.100503 -0.000000 tasub setnormal 0.000000 0.000000 1.000000 -tasub settarget 0.000000 0.000000 1.000000 0.000000 1.553424 1.553424 +tasub settarget 1.200000 0.000000 1.000000 0.000000 1.553424 1.553424 tasub r1 1.00 0.00 0.00 168.27 -23.46 0.00 0.00 5.00 5.00 tasub r2 0.00 0.00 1.00 84.78 -10.44 0.00 0.00 5.00 5.00 tasub update +#----- MultiMotor sa +sa recovernampos noeff a3 24 a4 48 diff --git a/test/testini.tcl b/test/testini.tcl index b128f0cf..d87dfc6a 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -180,5 +180,17 @@ MakeTasUB tasub MakeMulti sa sa alias a3 om sa alias a4 stt -sa pos noeff om 24 stt 48 +sa pos noeff a3 24 a4 48 sa endconfig + +#----------------------------------------------------------------------- +# Hipadaba +#---------------------------------------------------------------------- +InstallHdb +hmake /instrument spy none +hmake /instrument/sample spy none +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 diff --git a/test/testsics b/test/testsics index 6b571844..5fabdb39 100755 --- a/test/testsics +++ b/test/testsics @@ -18,38 +18,38 @@ 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 +source nxscripttest.tcl #------------ test SANS MultiMotor source testmumo.tcl