From 11d008620ae28539e6a034d0f9935d138f52c4e8 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 15 Oct 2014 09:14:58 +1100 Subject: [PATCH] SICS-742 spin flipper is instructed to power up but doesn't reach the target current. --- .../instrument/reflectometer/config/beamline/sct_RFGen.tcl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl b/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl index a2603048..7f66455c 100644 --- a/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl +++ b/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl @@ -146,6 +146,9 @@ proc ::scobj::rfgen::set_frequency {basePath} { ## # @brief Request a state report from the RF generator proc ::scobj::rfgen::rqStatFunc {} { + if { [hpropexists [sct] geterror] } { + hdelprop [sct] geterror + } sct send "L:[sct address]" return rdState } @@ -167,7 +170,6 @@ proc ::scobj::rfgen::rdStatFunc {} { set statStr [sct result] if {[string match "ASCERR:*" $statStr]} { sct geterror $statStr - sct ramping $RAMPIDLE return stateChange } set statList [split $statStr "|="] @@ -402,6 +404,8 @@ proc ::scobj::rfgen::mkRFGen {argList} { if {[SplitReply [rfgen_simulation]] == "false"} { set SCT_RFGEN sct_rfgen_$pa(NAME) makesctcontroller $SCT_RFGEN rfamp $pa(IP):$pa(PORT) + # The RFGen has been observed to fail to respond within the default timeout of 2 sec + $SCT_RFGEN timeout 5 hsetprop /sics/$pa(NAME) contname $SCT_RFGEN # mkStatArr stateArr [split [$SCT_RFGEN transact "L:$pa(ADDRESS)"] "|="]