From fe0bc8f0c0c8b1bfc1870080b8846735a1bf2710 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Mon, 10 Nov 2014 18:58:42 +1100 Subject: [PATCH] Regen two sct drivers --- .../config/beamline/sct_he3_polanal.tcl | 151 +++++++++--------- .../temperature/sct_eurotherm_3200.tcl | 28 ++-- 2 files changed, 90 insertions(+), 89 deletions(-) diff --git a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl index c8a59aad..9a14dbc6 100644 --- a/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl +++ b/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl @@ -4,6 +4,17 @@ namespace eval ::scobj::he3_polanal { set debug_threshold 0 +# preamble hook code starts + proc do_update { node dlist idx } { + if {[llength ${dlist}] > ${idx}} { + if {![string is double [lindex ${dlist} ${idx}]]} { + hupdateif ${node} 0.0 + } else { + hupdateif ${node} [lindex ${dlist} ${idx}] + } + } + } +# preamble hook code ends } proc ::scobj::he3_polanal::debug_log {tc_root debug_level debug_string} { @@ -127,27 +138,13 @@ proc ::scobj::he3_polanal::rdValue {tc_root} { set data [lindex ${dlist} 1] } set path [pathname [sct]] - set timestamp [clock format [clock seconds] -format "%T"] - if {[llength ${dlist}] > 2} { - set new_value [lindex ${dlist} 2] - if { "${new_value}" == "NaN" } { - set new_value 0 - } - hupdateif ${path}/amplitude "${new_value}" - } - if {[llength ${dlist}] > 3} { - hupdateif ${path}/freq "[lindex ${dlist} 3]" - } - if {[llength ${dlist}] > 4} { - hupdateif ${path}/phase "[lindex ${dlist} 4]" - } - if {[llength ${dlist}] > 5} { - hupdateif ${path}/time2 "[lindex ${dlist} 5]" - } - if {[llength ${dlist}] > 6} { - hupdateif ${path}/field "[lindex ${dlist} 6]" - } - hupdateif ${path}/timestamp "${timestamp}" + set timestamp [clock seconds] + [namespace current]::do_update ${path}/amplitude ${dlist} 2 + [namespace current]::do_update ${path}/freq ${dlist} 3 + [namespace current]::do_update ${path}/phase ${dlist} 4 + [namespace current]::do_update ${path}/time2 ${dlist} 5 + [namespace current]::do_update ${path}/field ${dlist} 6 + hupdateif ${path}/timestamp ${timestamp} # rdValue hook code ends if { [hpropexists [sct] geterror] } { debug_log ${tc_root} 9 "[sct] error: [sct geterror]" @@ -233,54 +230,54 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hfactory ${scobj_hpath}/analyser plain spy none - hfactory ${scobj_hpath}/analyser/amplitude plain user text + hfactory ${scobj_hpath}/analyser/amplitude plain user float hsetprop ${scobj_hpath}/analyser/amplitude control true hsetprop ${scobj_hpath}/analyser/amplitude data true hsetprop ${scobj_hpath}/analyser/amplitude mutable true hsetprop ${scobj_hpath}/analyser/amplitude nxsave true - hsetprop ${scobj_hpath}/analyser/amplitude oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/amplitude oldval 0.0 hsetprop ${scobj_hpath}/analyser/amplitude klass "parameter" hsetprop ${scobj_hpath}/analyser/amplitude sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/amplitude type "part" hsetprop ${scobj_hpath}/analyser/amplitude nxalias "${name}_analyser_amplitude" - hfactory ${scobj_hpath}/analyser/field plain user text + hfactory ${scobj_hpath}/analyser/field plain user float hsetprop ${scobj_hpath}/analyser/field control true hsetprop ${scobj_hpath}/analyser/field data true hsetprop ${scobj_hpath}/analyser/field mutable true hsetprop ${scobj_hpath}/analyser/field nxsave true hsetprop ${scobj_hpath}/analyser/field units Oersted - hsetprop ${scobj_hpath}/analyser/field oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/field oldval 0.0 hsetprop ${scobj_hpath}/analyser/field klass "parameter" hsetprop ${scobj_hpath}/analyser/field sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/field type "part" hsetprop ${scobj_hpath}/analyser/field nxalias "${name}_analyser_field" - hfactory ${scobj_hpath}/analyser/freq plain user text + hfactory ${scobj_hpath}/analyser/freq plain user float hsetprop ${scobj_hpath}/analyser/freq control true hsetprop ${scobj_hpath}/analyser/freq data true hsetprop ${scobj_hpath}/analyser/freq mutable true hsetprop ${scobj_hpath}/analyser/freq nxsave true hsetprop ${scobj_hpath}/analyser/freq units Hertz - hsetprop ${scobj_hpath}/analyser/freq oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/freq oldval 0.0 hsetprop ${scobj_hpath}/analyser/freq klass "parameter" hsetprop ${scobj_hpath}/analyser/freq sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/freq type "part" hsetprop ${scobj_hpath}/analyser/freq nxalias "${name}_analyser_freq" - hfactory ${scobj_hpath}/analyser/phase plain user text + hfactory ${scobj_hpath}/analyser/phase plain user float hsetprop ${scobj_hpath}/analyser/phase control true hsetprop ${scobj_hpath}/analyser/phase data true hsetprop ${scobj_hpath}/analyser/phase mutable true hsetprop ${scobj_hpath}/analyser/phase nxsave true hsetprop ${scobj_hpath}/analyser/phase units Degree - hsetprop ${scobj_hpath}/analyser/phase oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/phase oldval 0.0 hsetprop ${scobj_hpath}/analyser/phase klass "parameter" hsetprop ${scobj_hpath}/analyser/phase sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/phase type "part" hsetprop ${scobj_hpath}/analyser/phase nxalias "${name}_analyser_phase" - hfactory ${scobj_hpath}/analyser/spin plain user text + hfactory ${scobj_hpath}/analyser/spin plain user float hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} rdValue {analyser} hsetprop ${scobj_hpath}/analyser/spin rdValue ${ns}::rdValue ${scobj_hpath} hsetprop ${scobj_hpath}/analyser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {analyser} @@ -291,7 +288,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/analyser/spin mutable true hsetprop ${scobj_hpath}/analyser/spin nxsave true hsetprop ${scobj_hpath}/analyser/spin values +,-,Refresh - hsetprop ${scobj_hpath}/analyser/spin oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/spin oldval 0.0 hsetprop ${scobj_hpath}/analyser/spin klass "parameter" hsetprop ${scobj_hpath}/analyser/spin sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/spin type "part" @@ -306,24 +303,24 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/analyser/spin simulated true } - hfactory ${scobj_hpath}/analyser/time2 plain user text + hfactory ${scobj_hpath}/analyser/time2 plain user float hsetprop ${scobj_hpath}/analyser/time2 control true hsetprop ${scobj_hpath}/analyser/time2 data true hsetprop ${scobj_hpath}/analyser/time2 mutable true hsetprop ${scobj_hpath}/analyser/time2 nxsave true hsetprop ${scobj_hpath}/analyser/time2 units Second - hsetprop ${scobj_hpath}/analyser/time2 oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/time2 oldval 0.0 hsetprop ${scobj_hpath}/analyser/time2 klass "parameter" hsetprop ${scobj_hpath}/analyser/time2 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/time2 type "part" hsetprop ${scobj_hpath}/analyser/time2 nxalias "${name}_analyser_time2" - hfactory ${scobj_hpath}/analyser/timestamp plain user text + hfactory ${scobj_hpath}/analyser/timestamp plain user float hsetprop ${scobj_hpath}/analyser/timestamp control true hsetprop ${scobj_hpath}/analyser/timestamp data true hsetprop ${scobj_hpath}/analyser/timestamp mutable true hsetprop ${scobj_hpath}/analyser/timestamp nxsave true - hsetprop ${scobj_hpath}/analyser/timestamp oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser/timestamp oldval 0.0 hsetprop ${scobj_hpath}/analyser/timestamp klass "parameter" hsetprop ${scobj_hpath}/analyser/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/timestamp type "part" @@ -336,82 +333,82 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hfactory ${scobj_hpath}/analyser_start plain spy none - hfactory ${scobj_hpath}/analyser_start/amplitude plain user text + hfactory ${scobj_hpath}/analyser_start/amplitude plain user float hsetprop ${scobj_hpath}/analyser_start/amplitude control true hsetprop ${scobj_hpath}/analyser_start/amplitude data true hsetprop ${scobj_hpath}/analyser_start/amplitude mutable true hsetprop ${scobj_hpath}/analyser_start/amplitude nxsave true - hsetprop ${scobj_hpath}/analyser_start/amplitude oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/amplitude oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/amplitude klass "parameter" hsetprop ${scobj_hpath}/analyser_start/amplitude sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/amplitude type "part" hsetprop ${scobj_hpath}/analyser_start/amplitude nxalias "${name}_analyser_start_amplitude" - hfactory ${scobj_hpath}/analyser_start/field plain user text + hfactory ${scobj_hpath}/analyser_start/field plain user float hsetprop ${scobj_hpath}/analyser_start/field control true hsetprop ${scobj_hpath}/analyser_start/field data true hsetprop ${scobj_hpath}/analyser_start/field mutable true hsetprop ${scobj_hpath}/analyser_start/field nxsave true hsetprop ${scobj_hpath}/analyser_start/field units Oersted - hsetprop ${scobj_hpath}/analyser_start/field oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/field oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/field klass "parameter" hsetprop ${scobj_hpath}/analyser_start/field sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/field type "part" hsetprop ${scobj_hpath}/analyser_start/field nxalias "${name}_analyser_start_field" - hfactory ${scobj_hpath}/analyser_start/freq plain user text + hfactory ${scobj_hpath}/analyser_start/freq plain user float hsetprop ${scobj_hpath}/analyser_start/freq control true hsetprop ${scobj_hpath}/analyser_start/freq data true hsetprop ${scobj_hpath}/analyser_start/freq mutable true hsetprop ${scobj_hpath}/analyser_start/freq nxsave true hsetprop ${scobj_hpath}/analyser_start/freq units Hertz - hsetprop ${scobj_hpath}/analyser_start/freq oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/freq oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/freq klass "parameter" hsetprop ${scobj_hpath}/analyser_start/freq sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/freq type "part" hsetprop ${scobj_hpath}/analyser_start/freq nxalias "${name}_analyser_start_freq" - hfactory ${scobj_hpath}/analyser_start/phase plain user text + hfactory ${scobj_hpath}/analyser_start/phase plain user float hsetprop ${scobj_hpath}/analyser_start/phase control true hsetprop ${scobj_hpath}/analyser_start/phase data true hsetprop ${scobj_hpath}/analyser_start/phase mutable true hsetprop ${scobj_hpath}/analyser_start/phase nxsave true hsetprop ${scobj_hpath}/analyser_start/phase units Degree - hsetprop ${scobj_hpath}/analyser_start/phase oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/phase oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/phase klass "parameter" hsetprop ${scobj_hpath}/analyser_start/phase sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/phase type "part" hsetprop ${scobj_hpath}/analyser_start/phase nxalias "${name}_analyser_start_phase" - hfactory ${scobj_hpath}/analyser_start/spin plain user text + hfactory ${scobj_hpath}/analyser_start/spin plain user float hsetprop ${scobj_hpath}/analyser_start/spin control true hsetprop ${scobj_hpath}/analyser_start/spin data true hsetprop ${scobj_hpath}/analyser_start/spin mutable true hsetprop ${scobj_hpath}/analyser_start/spin nxsave true - hsetprop ${scobj_hpath}/analyser_start/spin oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/spin oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/spin klass "parameter" hsetprop ${scobj_hpath}/analyser_start/spin sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/spin type "part" hsetprop ${scobj_hpath}/analyser_start/spin nxalias "${name}_analyser_start_spin" - hfactory ${scobj_hpath}/analyser_start/time2 plain user text + hfactory ${scobj_hpath}/analyser_start/time2 plain user float hsetprop ${scobj_hpath}/analyser_start/time2 control true hsetprop ${scobj_hpath}/analyser_start/time2 data true hsetprop ${scobj_hpath}/analyser_start/time2 mutable true hsetprop ${scobj_hpath}/analyser_start/time2 nxsave true hsetprop ${scobj_hpath}/analyser_start/time2 units Second - hsetprop ${scobj_hpath}/analyser_start/time2 oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/time2 oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/time2 klass "parameter" hsetprop ${scobj_hpath}/analyser_start/time2 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/time2 type "part" hsetprop ${scobj_hpath}/analyser_start/time2 nxalias "${name}_analyser_start_time2" - hfactory ${scobj_hpath}/analyser_start/timestamp plain user text + hfactory ${scobj_hpath}/analyser_start/timestamp plain user float hsetprop ${scobj_hpath}/analyser_start/timestamp control true hsetprop ${scobj_hpath}/analyser_start/timestamp data true hsetprop ${scobj_hpath}/analyser_start/timestamp mutable true hsetprop ${scobj_hpath}/analyser_start/timestamp nxsave true - hsetprop ${scobj_hpath}/analyser_start/timestamp oldval UNKNOWN + hsetprop ${scobj_hpath}/analyser_start/timestamp oldval 0.0 hsetprop ${scobj_hpath}/analyser_start/timestamp klass "parameter" hsetprop ${scobj_hpath}/analyser_start/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/timestamp type "part" @@ -424,54 +421,54 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hfactory ${scobj_hpath}/polariser plain spy none - hfactory ${scobj_hpath}/polariser/amplitude plain user text + hfactory ${scobj_hpath}/polariser/amplitude plain user float hsetprop ${scobj_hpath}/polariser/amplitude control true hsetprop ${scobj_hpath}/polariser/amplitude data true hsetprop ${scobj_hpath}/polariser/amplitude mutable true hsetprop ${scobj_hpath}/polariser/amplitude nxsave true - hsetprop ${scobj_hpath}/polariser/amplitude oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/amplitude oldval 0.0 hsetprop ${scobj_hpath}/polariser/amplitude klass "parameter" hsetprop ${scobj_hpath}/polariser/amplitude sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/amplitude type "part" hsetprop ${scobj_hpath}/polariser/amplitude nxalias "${name}_polariser_amplitude" - hfactory ${scobj_hpath}/polariser/field plain user text + hfactory ${scobj_hpath}/polariser/field plain user float hsetprop ${scobj_hpath}/polariser/field control true hsetprop ${scobj_hpath}/polariser/field data true hsetprop ${scobj_hpath}/polariser/field mutable true hsetprop ${scobj_hpath}/polariser/field nxsave true hsetprop ${scobj_hpath}/polariser/field units Oersted - hsetprop ${scobj_hpath}/polariser/field oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/field oldval 0.0 hsetprop ${scobj_hpath}/polariser/field klass "parameter" hsetprop ${scobj_hpath}/polariser/field sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/field type "part" hsetprop ${scobj_hpath}/polariser/field nxalias "${name}_polariser_field" - hfactory ${scobj_hpath}/polariser/freq plain user text + hfactory ${scobj_hpath}/polariser/freq plain user float hsetprop ${scobj_hpath}/polariser/freq control true hsetprop ${scobj_hpath}/polariser/freq data true hsetprop ${scobj_hpath}/polariser/freq mutable true hsetprop ${scobj_hpath}/polariser/freq nxsave true hsetprop ${scobj_hpath}/polariser/freq units Hertz - hsetprop ${scobj_hpath}/polariser/freq oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/freq oldval 0.0 hsetprop ${scobj_hpath}/polariser/freq klass "parameter" hsetprop ${scobj_hpath}/polariser/freq sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/freq type "part" hsetprop ${scobj_hpath}/polariser/freq nxalias "${name}_polariser_freq" - hfactory ${scobj_hpath}/polariser/phase plain user text + hfactory ${scobj_hpath}/polariser/phase plain user float hsetprop ${scobj_hpath}/polariser/phase control true hsetprop ${scobj_hpath}/polariser/phase data true hsetprop ${scobj_hpath}/polariser/phase mutable true hsetprop ${scobj_hpath}/polariser/phase nxsave true hsetprop ${scobj_hpath}/polariser/phase units Degree - hsetprop ${scobj_hpath}/polariser/phase oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/phase oldval 0.0 hsetprop ${scobj_hpath}/polariser/phase klass "parameter" hsetprop ${scobj_hpath}/polariser/phase sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/phase type "part" hsetprop ${scobj_hpath}/polariser/phase nxalias "${name}_polariser_phase" - hfactory ${scobj_hpath}/polariser/spin plain user text + hfactory ${scobj_hpath}/polariser/spin plain user float hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} rdValue {polariser} hsetprop ${scobj_hpath}/polariser/spin rdValue ${ns}::rdValue ${scobj_hpath} hsetprop ${scobj_hpath}/polariser/spin write ${ns}::setValue ${scobj_hpath} chkWrite {polariser} @@ -482,7 +479,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser/spin mutable true hsetprop ${scobj_hpath}/polariser/spin nxsave true hsetprop ${scobj_hpath}/polariser/spin values +,-,Refresh - hsetprop ${scobj_hpath}/polariser/spin oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/spin oldval 0.0 hsetprop ${scobj_hpath}/polariser/spin klass "parameter" hsetprop ${scobj_hpath}/polariser/spin sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/spin type "part" @@ -497,24 +494,24 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser/spin simulated true } - hfactory ${scobj_hpath}/polariser/time2 plain user text + hfactory ${scobj_hpath}/polariser/time2 plain user float hsetprop ${scobj_hpath}/polariser/time2 control true hsetprop ${scobj_hpath}/polariser/time2 data true hsetprop ${scobj_hpath}/polariser/time2 mutable true hsetprop ${scobj_hpath}/polariser/time2 nxsave true hsetprop ${scobj_hpath}/polariser/time2 units Second - hsetprop ${scobj_hpath}/polariser/time2 oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/time2 oldval 0.0 hsetprop ${scobj_hpath}/polariser/time2 klass "parameter" hsetprop ${scobj_hpath}/polariser/time2 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/time2 type "part" hsetprop ${scobj_hpath}/polariser/time2 nxalias "${name}_polariser_time2" - hfactory ${scobj_hpath}/polariser/timestamp plain user text + hfactory ${scobj_hpath}/polariser/timestamp plain user float hsetprop ${scobj_hpath}/polariser/timestamp control true hsetprop ${scobj_hpath}/polariser/timestamp data true hsetprop ${scobj_hpath}/polariser/timestamp mutable true hsetprop ${scobj_hpath}/polariser/timestamp nxsave true - hsetprop ${scobj_hpath}/polariser/timestamp oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser/timestamp oldval 0.0 hsetprop ${scobj_hpath}/polariser/timestamp klass "parameter" hsetprop ${scobj_hpath}/polariser/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/timestamp type "part" @@ -527,82 +524,82 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hfactory ${scobj_hpath}/polariser_start plain spy none - hfactory ${scobj_hpath}/polariser_start/amplitude plain user text + hfactory ${scobj_hpath}/polariser_start/amplitude plain user float hsetprop ${scobj_hpath}/polariser_start/amplitude control true hsetprop ${scobj_hpath}/polariser_start/amplitude data true hsetprop ${scobj_hpath}/polariser_start/amplitude mutable true hsetprop ${scobj_hpath}/polariser_start/amplitude nxsave true - hsetprop ${scobj_hpath}/polariser_start/amplitude oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/amplitude oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/amplitude klass "parameter" hsetprop ${scobj_hpath}/polariser_start/amplitude sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/amplitude type "part" hsetprop ${scobj_hpath}/polariser_start/amplitude nxalias "${name}_polariser_start_amplitude" - hfactory ${scobj_hpath}/polariser_start/field plain user text + hfactory ${scobj_hpath}/polariser_start/field plain user float hsetprop ${scobj_hpath}/polariser_start/field control true hsetprop ${scobj_hpath}/polariser_start/field data true hsetprop ${scobj_hpath}/polariser_start/field mutable true hsetprop ${scobj_hpath}/polariser_start/field nxsave true hsetprop ${scobj_hpath}/polariser_start/field units Oersted - hsetprop ${scobj_hpath}/polariser_start/field oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/field oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/field klass "parameter" hsetprop ${scobj_hpath}/polariser_start/field sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/field type "part" hsetprop ${scobj_hpath}/polariser_start/field nxalias "${name}_polariser_start_field" - hfactory ${scobj_hpath}/polariser_start/freq plain user text + hfactory ${scobj_hpath}/polariser_start/freq plain user float hsetprop ${scobj_hpath}/polariser_start/freq control true hsetprop ${scobj_hpath}/polariser_start/freq data true hsetprop ${scobj_hpath}/polariser_start/freq mutable true hsetprop ${scobj_hpath}/polariser_start/freq nxsave true hsetprop ${scobj_hpath}/polariser_start/freq units Hertz - hsetprop ${scobj_hpath}/polariser_start/freq oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/freq oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/freq klass "parameter" hsetprop ${scobj_hpath}/polariser_start/freq sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/freq type "part" hsetprop ${scobj_hpath}/polariser_start/freq nxalias "${name}_polariser_start_freq" - hfactory ${scobj_hpath}/polariser_start/phase plain user text + hfactory ${scobj_hpath}/polariser_start/phase plain user float hsetprop ${scobj_hpath}/polariser_start/phase control true hsetprop ${scobj_hpath}/polariser_start/phase data true hsetprop ${scobj_hpath}/polariser_start/phase mutable true hsetprop ${scobj_hpath}/polariser_start/phase nxsave true hsetprop ${scobj_hpath}/polariser_start/phase units Degree - hsetprop ${scobj_hpath}/polariser_start/phase oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/phase oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/phase klass "parameter" hsetprop ${scobj_hpath}/polariser_start/phase sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/phase type "part" hsetprop ${scobj_hpath}/polariser_start/phase nxalias "${name}_polariser_start_phase" - hfactory ${scobj_hpath}/polariser_start/spin plain user text + hfactory ${scobj_hpath}/polariser_start/spin plain user float hsetprop ${scobj_hpath}/polariser_start/spin control true hsetprop ${scobj_hpath}/polariser_start/spin data true hsetprop ${scobj_hpath}/polariser_start/spin mutable true hsetprop ${scobj_hpath}/polariser_start/spin nxsave true - hsetprop ${scobj_hpath}/polariser_start/spin oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/spin oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/spin klass "parameter" hsetprop ${scobj_hpath}/polariser_start/spin sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/spin type "part" hsetprop ${scobj_hpath}/polariser_start/spin nxalias "${name}_polariser_start_spin" - hfactory ${scobj_hpath}/polariser_start/time2 plain user text + hfactory ${scobj_hpath}/polariser_start/time2 plain user float hsetprop ${scobj_hpath}/polariser_start/time2 control true hsetprop ${scobj_hpath}/polariser_start/time2 data true hsetprop ${scobj_hpath}/polariser_start/time2 mutable true hsetprop ${scobj_hpath}/polariser_start/time2 nxsave true hsetprop ${scobj_hpath}/polariser_start/time2 units Second - hsetprop ${scobj_hpath}/polariser_start/time2 oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/time2 oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/time2 klass "parameter" hsetprop ${scobj_hpath}/polariser_start/time2 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/time2 type "part" hsetprop ${scobj_hpath}/polariser_start/time2 nxalias "${name}_polariser_start_time2" - hfactory ${scobj_hpath}/polariser_start/timestamp plain user text + hfactory ${scobj_hpath}/polariser_start/timestamp plain user float hsetprop ${scobj_hpath}/polariser_start/timestamp control true hsetprop ${scobj_hpath}/polariser_start/timestamp data true hsetprop ${scobj_hpath}/polariser_start/timestamp mutable true hsetprop ${scobj_hpath}/polariser_start/timestamp nxsave true - hsetprop ${scobj_hpath}/polariser_start/timestamp oldval UNKNOWN + hsetprop ${scobj_hpath}/polariser_start/timestamp oldval 0.0 hsetprop ${scobj_hpath}/polariser_start/timestamp klass "parameter" hsetprop ${scobj_hpath}/polariser_start/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/timestamp type "part" diff --git a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl index 690f4227..e4b2358e 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_3200.tcl @@ -89,7 +89,7 @@ proc ::scobj::eurotherm_3200::checkstatus {tc_root} { if {[hpropexists [sct] simulated] && [sct simulated] == "true"} { set pv "${sp}" hupdateif ${tc_root}/[sct driveable] ${sp} - } + } else { set pv "[hval ${tc_root}/[sct driveable]]" } if { abs(${pv} - ${sp}) <= [sct tolerance] } { @@ -229,8 +229,8 @@ proc ::scobj::eurotherm_3200::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port id datype dev_id tol } { - ::scobj::eurotherm_3200::sics_log 9 "::scobj::eurotherm_3200::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" +proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port id datype dev_id {tol 5} {lowerlimit 0} {upperlimit 500} } { + ::scobj::eurotherm_3200::sics_log 9 "::scobj::eurotherm_3200::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} ${lowerlimit} ${upperlimit}" set ns "[namespace current]" set catch_status [ catch { @@ -281,8 +281,8 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath}/loop1/setpoint data true hsetprop ${scobj_hpath}/loop1/setpoint mutable true hsetprop ${scobj_hpath}/loop1/setpoint nxsave true - hsetprop ${scobj_hpath}/loop1/setpoint lowerlimit 0 - hsetprop ${scobj_hpath}/loop1/setpoint upperlimit 40 + hsetprop ${scobj_hpath}/loop1/setpoint lowerlimit ${lowerlimit} + hsetprop ${scobj_hpath}/loop1/setpoint upperlimit ${upperlimit} hsetprop ${scobj_hpath}/loop1/setpoint tolerance ${tol} hsetprop ${scobj_hpath}/loop1/setpoint permlink data_set "T[format "%02d" ${id}]SP01" hsetprop ${scobj_hpath}/loop1/setpoint @description "T[format "%02d" ${id}]SP01" @@ -569,9 +569,9 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula handle_exception ${catch_status} ${catch_message} } -proc ::scobj::eurotherm_3200::add_driver {name device_class simulation_flag ip_address tcp_port id datype dev_id tol} { +proc ::scobj::eurotherm_3200::add_driver {name device_class simulation_flag ip_address tcp_port id datype dev_id {tol 5 } {lowerlimit 0} {upperlimit 500}} { set catch_status [ catch { - ::scobj::eurotherm_3200::sics_log 9 "::scobj::eurotherm_3200::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::eurotherm_3200::sics_log 9 "::scobj::eurotherm_3200::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} ${lowerlimit} ${upperlimit}" if {[string equal -nocase "${simulation_flag}" "false"]} { if {[string equal -nocase "aqadapter" "${ip_address}"]} { ::scobj::eurotherm_3200::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" @@ -585,8 +585,8 @@ proc ::scobj::eurotherm_3200::add_driver {name device_class simulation_flag ip_a ::scobj::eurotherm_3200::sics_log 9 "makesctcontroller sct_${name} aqadapter NULL" makesctcontroller sct_${name} aqadapter NULL } - ::scobj::eurotherm_3200::sics_log 1 "::scobj::eurotherm_3200::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" - ::scobj::eurotherm_3200::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} + ::scobj::eurotherm_3200::sics_log 1 "::scobj::eurotherm_3200::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} ${lowerlimit} ${upperlimit}" + ::scobj::eurotherm_3200::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} ${lowerlimit} ${upperlimit} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -599,9 +599,9 @@ namespace eval ::scobj::eurotherm_3200 { namespace export add_driver } -proc add_eurotherm_3200 {name ip_address tcp_port id datype dev_id tol} { +proc add_eurotherm_3200 {name ip_address tcp_port id datype dev_id {tol 5 } {lowerlimit 0} {upperlimit 500}} { set simulation_flag "[string tolower [SplitReply [environment_simulation]]]" - ::scobj::eurotherm_3200::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} + ::scobj::eurotherm_3200::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} ${lowerlimit} ${upperlimit} } clientput "file evaluation of sct_eurotherm_3200.tcl" @@ -679,11 +679,15 @@ proc ::scobj::eurotherm_3200::read_config {} { } set arg_list [list] set missing_list [list] - foreach arg {id datype dev_id tol} { + array unset default_map + array set default_map [list tol 5 lowerlimit 0 upperlimit 500] + foreach arg {id datype dev_id tol lowerlimit upperlimit} { if {[dict exists $u $arg]} { lappend arg_list "[dict get $u $arg]" } elseif {[dict exists $v $arg]} { lappend arg_list "[dict get $v $arg]" + } elseif {[info exists default_map($arg)]} { + lappend arg_list $default_map($arg) } else { ${ns}::sics_log 9 "Missing configuration value $arg" lappend missing_list $arg