From 59309cec602decd4afa3089db0e64cb2a94e962b Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 6 Feb 2015 14:36:39 +1100 Subject: [PATCH] SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation. Also added some extra chopper status variables. --- site_ansto/instrument/bilby/config/chopper/chopper.tcl | 4 ++++ .../instrument/bilby/config/motors/motor_configuration.tcl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/bilby/config/chopper/chopper.tcl b/site_ansto/instrument/bilby/config/chopper/chopper.tcl index 462756e2..ec259b3a 100644 --- a/site_ansto/instrument/bilby/config/chopper/chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/chopper.tcl @@ -50,3 +50,7 @@ if [dict exists $::config_dict disk_chopper name] { sicslist setatt t0_chopper_freq klass NXdisk_chopper sicslist setatt t0_chopper_freq long_name t0_chopper_freq sicslist setatt t0_chopper_freq mutable true +::utility::mkVar master_chopper_id int user master_chopper_id true NXdisk_chopper true true +::utility::mkVar master_chopper_freq float user master_chopper_freq true NXdisk_chopper true true +::utility::mkVar t0_chopper_phase float user t0_chopper_phase true NXdisk_chopper true true + diff --git a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl index d8396c28..8bc951d6 100644 --- a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl @@ -516,7 +516,7 @@ sicslist setatt gs_L2_curtaind long_name L2_curtaind ## Lt0 proc Lt0 {} { - set t0_id [SplitReply [t0_chopper_id]] + set t0_id [SplitReply [master_chopper_id]] switch $t0_id { "1" { set retval 0.0} "2" { set retval 1100.0}