diff --git a/site_ansto/instrument/kookaburra/config/counter/sct_bm.tcl b/site_ansto/instrument/kookaburra/config/counter/sct_bm.tcl index 28a5ee37..f3b73095 100644 --- a/site_ansto/instrument/kookaburra/config/counter/sct_bm.tcl +++ b/site_ansto/instrument/kookaburra/config/counter/sct_bm.tcl @@ -1,6 +1,6 @@ ########################################################################################################################### # -# file Proptocols between SICS and Embedded I/O device in Kookoburra +# file Proptocols between SICS and Embedded I/O device in Kookoburra # # This is a driver for SICS to communicate with the embedded I/O box on Kookoburra # @@ -11,7 +11,7 @@ # ::scobj::emHV::mkEmHV { # name "emHV" # IP localhost -# PORT 55010 +# PORT 55010 # tuning 1 # interval 1 # @@ -33,7 +33,7 @@ proc ::scobj::emHV::getEmStatusFunc {chan} { if {[hpropexists [sct] geterror]} { hdelprop [sct] geterror - } + } set comm "get hvstatus$chan" sct send $comm @@ -93,7 +93,7 @@ proc ::scobj::emHV::ckCounterStateFunc {basePath} { clientput "Counter pause" return idle } else { - clientput "Counter progressing ..." + clientput "Counter progressing ..." set comm "get counter\r\n" sct send $comm return ckCounterState @@ -111,7 +111,7 @@ proc ::scobj::emHV::setPointFunc {basePath chan} { proc ::scobj::emHV::ckVolStatusFunc {basePath chan} { set replyStr [sct result] - + if {[string first "ASCERR" $replyStr] != -1} { sct geterror $replyStr return -code error "Error in emHV Response: $replyStr" @@ -161,19 +161,19 @@ proc ::scobj::emHV::rampVolFunc {basePath chan} { sct send "get hvstatus$chan\r\n" return rampVol$chan } - } + } } ## # @brief Make a emHV Controller -# -# @param argList, {name "emHV" IP localhost PORT 65123 tuning 1 interval 1} +# +# @param argList, {name "emHV" IP localhost PORT 65123 tuning 1 interval 1} # # name: name of emHV controller object # IP: IP address of RF generator moxa box # PORT: Port number assigned to the generator on the moxa-box # tuning: boolean, set tuning=1 to allow instrument scientists to set the axe positions -# interval: polling and ramping interval in seconds. +# interval: polling and ramping interval in seconds. proc ::scobj::emHV::mkEmHV {argList} { # Generate parameter array from the argument list @@ -183,11 +183,11 @@ proc ::scobj::emHV::mkEmHV {argList} { } MakeSICSObj $pa(NAME) SCT_OBJECT - sicslist setatt $pa(NAME) klass environment + sicslist setatt $pa(NAME) klass environment sicslist setatt $pa(NAME) long_name $pa(NAME) sicslist setatt $pa(NAME) privilege spy - set scobj_hpath /sics/$pa(NAME) + set scobj_hpath /sics/$pa(NAME) makesctcontroller sct_$pa(NAME) std $pa(IP):$pa(PORT) @@ -202,7 +202,7 @@ proc ::scobj::emHV::mkEmHV {argList} { hfactory $scobj_hpath/uA2 plain user int hfactory $scobj_hpath/status2 plain user text hfactory $scobj_hpath/target2 plain user int - + # Counter Component hfactory $scobj_hpath/count1 plain user int hfactory $scobj_hpath/count2 plain user int @@ -262,10 +262,10 @@ proc ::scobj::emHV::mkEmHV {argList} { hsetprop $scobj_hpath privilege spy hsetprop $scobj_hpath control true hsetprop $scobj_hpath data true - + foreach {hPath klass control data priv type} { - ch1 NXsensor true true user NXsensor - ch2 NXsensor true true user NXsensor + ch1 NXsensor true true user NXsensor + ch2 NXsensor true true user NXsensor } { hsetprop $scobj_hpath/$hPath klass $klass hsetprop $scobj_hpath/$hPath privilege $priv @@ -295,7 +295,7 @@ proc ::scobj::emHV::mkEmHV {argList} { hsetprop $scobj_hpath/$hpath mutable $mutable hsetprop $scobj_hpath/$hpath nxalias $alias hsetprop $scobj_hpath/$hpath sdsinfo ::nexus::scobj::sdsinfo - } + } } proc emHV1 {{vol ""} args} { @@ -379,14 +379,8 @@ publish setcounter user #IP for SIS PLC 137.157.205.21 30000 ::scobj::emHV::mkEmHV { name "emHV" - IP 137.157.205.22 + IP 137.157.205.22 PORT 30000 tuning 1 interval 1 } - - - - - -