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

Pick up some obvious changes from Wombat

Browse Source
This commit is contained in:
Douglas Clowes
2014-06-24 17:32:22 +10:00
parent e3377553bd
commit 95974df5e4
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
site_ansto/instrument/config/counter/counter_common_1.tcl
View File

@ -7,6 +7,7 @@ namespace eval counter {
proc ::counter::transferscript {} { proc ::counter::transferscript {} {
variable isc_numchannels variable isc_numchannels
bm status
set val [SplitReply [bm1 gettime]] set val [SplitReply [bm1 gettime]]
for {set i 1} {$i <= $isc_numchannels} {incr i} { for {set i 1} {$i <= $isc_numchannels} {incr i} {
append val " [SplitReply [bm$i getcounts] ]" append val " [SplitReply [bm$i getcounts] ]"

14
site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
View File

@ -190,11 +190,11 @@ publish greenVol user
#IP 137.157.204.8 #IP 137.157.204.8
#PORT 22 #PORT 22
::scobj::green::mkGreen { #::scobj::green::mkGreen {
name "green_magnet" # name "green_magnet"
IP 137.157.204.57 # IP 137.157.204.57
PORT 22 # PORT 22
tuning 1 # tuning 1
interval 3 # interval 3
} #}

12
site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
View File

@ -929,13 +929,13 @@ namespace import ::scobj::[set vendor]_[set device]::*
# add_lakeshore_370 "tc371" 127.0.0.1 7371 2.0 # 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" puts "ADD LAKESHORE 370"
set IP [dict get $::config_dict ls370 ip] set IP [dict get $::config_dict ls370_2 ip]
set PORT [dict get $::config_dict ls370 port] set PORT [dict get $::config_dict ls370_2 port]
set NAME [dict get $::config_dict ls370 name] set NAME [dict get $::config_dict ls370_2 name]
set TOL [dict get $::config_dict ls370 tol] set TOL [dict get $::config_dict ls370_2 tol]
set TERM [dict get $::config_dict ls370 terminator] set TERM [dict get $::config_dict ls370_2 terminator]
add_lakeshore_370 $NAME $IP $PORT $TOL add_lakeshore_370 $NAME $IP $PORT $TOL
} }

4
site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
View File

@ -63,7 +63,7 @@ namespace eval ::scobj::[set vendor]_[set device] {
set fd [open "[set [namespace current]::log_file]" "a"] set fd [open "[set [namespace current]::log_file]" "a"]
set line "[clock format [clock seconds] -format "%T"] $arg_string" set line "[clock format [clock seconds] -format "%T"] $arg_string"
puts $fd "$line" puts $fd "$line"
puts "debug_log $line" #puts "debug_log $line"
close $fd close $fd
} }
} }
@ -876,7 +876,7 @@ if {0} {
puts "[namespace current]::ven_dev [set [namespace current]::ven_dev]" puts "[namespace current]::ven_dev [set [namespace current]::ven_dev]"
puts "[namespace current]::log_file [set [namespace current]::log_file]" puts "[namespace current]::log_file [set [namespace current]::log_file]"
if {[SplitReply [environment_simulation]]=="false"} { 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 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" debug_log 1 "::scobj::oxford_mercury::mk_sct_driver sct_${the_name} environment ${the_name} ${_tol} $CID $CTYPE"