Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2008-05-30 10:26:57 +10:00
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions
--- a/site_ansto/instrument/config/commands/commands_common.tcl
+++ b/site_ansto/instrument/config/commands/commands_common.tcl
@@ -0,0 +1,85 @@
+##
+# @file Definition of common command node procs.
+
+################################################################################
+# SCAN COMMANDS
+namespace eval scan {
+command hdb_bmonscan {
+  text=drivable scan_variable
+  float scan_start
+  float scan_increment
+  int NP
+  text=monitor,timer mode
+  float preset
+  int=0,2 channel
+} { 
+
+    bmonscan clear
+#    bmonscan configure script
+
+    bmonscan add $scan_variable $scan_start $scan_increment
+    bmonscan setchannel $channel;
+    set status [catch {bmonscan run $NP $mode $preset} msg]
+#    bmonscan configure soft
+    if {$status == 0} {
+      return $msg
+    } else {
+      return -code error "ERROR [info level 0]"
+    }
+
+
+}
+::scan::hdb_bmonscan -addfb text filename text mode float preset float scan_variable_value int scanpoint int counts text status
+::scan::hdb_bmonscan -set feedback status IDLE
+
+command hdb_hmscan {
+  text=drivable scan_variable
+  float scan_start
+  float scan_increment
+  int NP
+  text=monitor,timer mode
+  float preset
+  int=0,2 channel
+} { 
+
+    hmscan clear
+
+    hmscan add $scan_variable $scan_start $scan_increment
+    hmscan setchannel $channel;
+    set status [catch {hmscan run $NP $mode $preset} msg]
+
+    if {$status == 0} {
+      return $msg
+    } else {
+      return -code error "ERROR [info level 0]"
+    }
+
+
+}
+::scan::hdb_hmscan -addfb text filename text mode float preset float scan_variable_value int scanpoint int counts text status
+::scan::hdb_hmscan -set feedback status IDLE
+}
+sicslist setatt ::scan::hdb_bmonscan long_name bmonscan
+sicslist setatt ::scan::hdb_hmscan long_name hmscan
+################################################################################
+
+################################################################################
+# MONITOR COMMANDS
+namespace eval monitor {
+  command count {
+    text=timer,monitor mode
+    float preset
+  } {
+    ::monitor::count -set feedback status BUSY
+    bm setmode $mode
+    bm count $preset
+    ::monitor::count -set feedback counts [SplitReply [bm getcounts]];
+    ::monitor::count -set feedback status IDLE
+  }
+  ::monitor::count -addfb int counts text status
+  ::monitor::count -set feedback status IDLE
+  array set fbarr [::monitor::count -list feedback]
+  ::utility::mkData $fbarr(counts) data monitor privilege user mutable true
+  array unset fbarr
+}
+################################################################################