diff --git a/site_ansto/instrument/config/counter/counter_common_1.tcl b/site_ansto/instrument/config/counter/counter_common_1.tcl index 9ad2782c..1a16dd32 100644 --- a/site_ansto/instrument/config/counter/counter_common_1.tcl +++ b/site_ansto/instrument/config/counter/counter_common_1.tcl @@ -7,6 +7,7 @@ namespace eval counter { proc ::counter::transferscript {} { variable isc_numchannels + bm status set val [SplitReply [bm1 gettime]] for {set i 1} {$i <= $isc_numchannels} {incr i} { append val " [SplitReply [bm$i getcounts] ]" diff --git a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl index 12bcddfa..05d4607a 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl @@ -190,11 +190,11 @@ publish greenVol user #IP 137.157.204.8 #PORT 22 -::scobj::green::mkGreen { - name "green_magnet" - IP 137.157.204.57 - PORT 22 - tuning 1 - interval 3 -} +#::scobj::green::mkGreen { +# name "green_magnet" +# IP 137.157.204.57 +# PORT 22 +# tuning 1 +# interval 3 +#} diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl index 0357d688..d01afafb 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl @@ -929,13 +929,13 @@ namespace import ::scobj::[set vendor]_[set device]::* # add_lakeshore_370 "tc371" 127.0.0.1 7371 2.0 -if { [ info exists ::config_dict ] && [ dict get $::config_dict ls370 enabled ] } { +if { [ info exists ::config_dict ] && [ dict get $::config_dict ls370_2 enabled ] } { puts "ADD LAKESHORE 370" - set IP [dict get $::config_dict ls370 ip] - set PORT [dict get $::config_dict ls370 port] - set NAME [dict get $::config_dict ls370 name] - set TOL [dict get $::config_dict ls370 tol] - set TERM [dict get $::config_dict ls370 terminator] + set IP [dict get $::config_dict ls370_2 ip] + set PORT [dict get $::config_dict ls370_2 port] + set NAME [dict get $::config_dict ls370_2 name] + set TOL [dict get $::config_dict ls370_2 tol] + set TERM [dict get $::config_dict ls370_2 terminator] add_lakeshore_370 $NAME $IP $PORT $TOL } diff --git a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl b/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl index f9fef49a..7a93a4c6 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl @@ -63,7 +63,7 @@ namespace eval ::scobj::[set vendor]_[set device] { set fd [open "[set [namespace current]::log_file]" "a"] set line "[clock format [clock seconds] -format "%T"] $arg_string" puts $fd "$line" - puts "debug_log $line" + #puts "debug_log $line" close $fd } } @@ -876,7 +876,7 @@ if {0} { puts "[namespace current]::ven_dev [set [namespace current]::ven_dev]" puts "[namespace current]::log_file [set [namespace current]::log_file]" if {[SplitReply [environment_simulation]]=="false"} { - debug_log 1 "makesctcontroller sct_${the_name} std ${IP}:${port}" + debug_log 1 "makesctcontroller sct_${the_name} std ${IP}:${port} $terminator" makesctcontroller sct_${the_name} std ${IP}:${port} $terminator } debug_log 1 "::scobj::oxford_mercury::mk_sct_driver sct_${the_name} environment ${the_name} ${_tol} $CID $CTYPE"