From 03b583655cbd6b31500496a5cd4d9a1a2a013be3 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Wed, 31 Oct 2007 17:00:54 +1100
Subject: [PATCH] Added chopper "ready?" query and "get_frequency" command.
 Also added chopper simulation mode.

r2206 | ffr | 2007-10-31 17:00:54 +1100 (Wed, 31 Oct 2007) | 3 lines
---
 .../reflectometer/config/chopper/chopper.tcl  | 78 ++++++++++++++-----
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/site_ansto/instrument/reflectometer/config/chopper/chopper.tcl b/site_ansto/instrument/reflectometer/config/chopper/chopper.tcl
index d8a6f24e..88c188ea 100644
--- a/site_ansto/instrument/reflectometer/config/chopper/chopper.tcl
+++ b/site_ansto/instrument/reflectometer/config/chopper/chopper.tcl
@@ -1,26 +1,64 @@
-if 0 {
+set sim_mode [SplitReply [chopper_simulation]]
+set CH1_MAXSPEED 1800
+if {$sim_mode == "true"} {
+  MakeChopper chopperController sim
+  ChopperAdapter chspeed chopperController speed 0 $CH1_MAXSPEED
+  ChopperAdapter ch2phase chopperController phase 0 180
+  ChopperAdapter ch3phase chopperController phase 0 180
+  ChopperAdapter ch4phase chopperController phase 0 180
+  namespace eval ::chopper {
+    proc ready? {} {}
+    proc get_frequency {} {variable frequency; return $frequency}
+    proc set_frequency {freq} {variable frequency; set frequency $freq}
+    set_frequency 0
+  }
+  publish ::chopper::ready? user
+  publish ::chopper::get_frequency user
+  publish ::chopper::set_frequency user
+} else {
 # Chopper NCS013 communications
-set chopper_controller(host) 137.157.202.130
-set chopper_controller(port) 10000
-set chopper_controller(user) NCS
-set chopper_controller(password) NCS013
+  set chopper_controller(host) 137.157.202.130
+    set chopper_controller(port) 10000
+    set chopper_controller(user) NCS
+    set chopper_controller(password) NCS013
 
 
 # CHOPPER
-MakeChopper chopperController tcpdocho [params \
-  host $chopper_controller(host) \
-  port $chopper_controller(port) \
-  nchopper 4 \
-  timeout 30 \
-  user $chopper_controller(user) \
-  password $chopper_controller(password) \
-]
-ChopperAdapter chspeed chopperController speed 0 10
-}
-namespace eval ::chopper {
-  command set_freq {float: frequency} {
-    for {set i 0} {$i < $frequency} {incr i} {
-      clientput chop
+    MakeChopper chopperController tcpdocho [params \
+    host $chopper_controller(host) \
+    port $chopper_controller(port) \
+    nchopper 4 \
+    timeout 30 \
+    user $chopper_controller(user) \
+    password $chopper_controller(password) \
+    ]
+    ChopperAdapter chspeed chopperController speed_1 0 $CH1_MAXSPEED
+    ChopperAdapter ch2phase chopperController phase_2 0 180
+    ChopperAdapter ch3phase chopperController phase_3 0 180
+    ChopperAdapter ch4phase chopperController phase_4 0 180
+
+    namespace eval ::chopper {
+##
+# @brief Return TCL_ERROR if chopper is in a state which disallows data acquisition.
+# This is useful for aborting scans or batch files.
+      proc ready? {} {
+        set msg [chopperController status]
+          if {[lindex $msg 2] == "NOTREADY:"} {
+            set errmsg  "CHOPPER [lrange $msg 2 end]"
+              return -code error $errmsg
+          }
+      } 
+
+##
+# @brief Return the last known chopper frequency. To get the current frequency you
+# must issue a 'chopperController update' command first.
+      proc get_frequency {} {
+        set msg [split [SplitReply [chopperController frequency]] : ]
+          if {[lindex $msg 0] == "FAILED"} { 
+            return -code error [lindex $msg 1]
+          } else {
+            return $msg
+          } 
+      }
     }
-  }
 }