linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-847: Replace t0_chopper_id with master_chopper_id in Lt0 calculation.

Browse Source 
Also added some extra chopper status variables.
This commit is contained in:
Ferdi Franceschini
2015-02-06 14:36:39 +11:00
parent e45edb3913
commit 59309cec60
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/bilby/config/chopper/chopper.tcl
View File

@ -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 klass NXdisk_chopper
sicslist setatt t0_chopper_freq long_name t0_chopper_freq sicslist setatt t0_chopper_freq long_name t0_chopper_freq
sicslist setatt t0_chopper_freq mutable true 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

2
site_ansto/instrument/bilby/config/motors/motor_configuration.tcl
View File

@ -516,7 +516,7 @@ sicslist setatt gs_L2_curtaind long_name L2_curtaind
## Lt0 ## Lt0
proc Lt0 {} { proc Lt0 {} {
set t0_id [SplitReply [t0_chopper_id]] set t0_id [SplitReply [master_chopper_id]]
switch $t0_id { switch $t0_id {
"1" { set retval 0.0} "1" { set retval 0.0}
"2" { set retval 1100.0} "2" { set retval 1100.0}