diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl index f2253758..fe06d19d 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl @@ -1879,8 +1879,14 @@ proc add_sct_ls336 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {_verbose 0} return } if {[ catch { - puts "\nadd_ls336: makesctcontroller $name std ${IP}:$port for Lakeshore model 336" - makesctcontroller sct_ls336_$name std ${IP}:$port $terminator + if {[string equal -nocase "aqadapter" "${IP}"]} { + # dcl 2013-05-27: in this case the port is the name of the AsyncQueue + puts "\nadd_ls336: makesctcontroller sct_ls336_$name aqadapter ${port} for Lakeshore model 336" + makesctcontroller sct_ls336_$name aqadapter ${port} + } else { + puts "\nadd_ls336: makesctcontroller sct_ls336_$name std ${IP}:$port $terminator for Lakeshore model 336" + makesctcontroller sct_ls336_$name std ${IP}:$port $terminator + } mk_sct_lakeshore_336 sct_ls336_$name environment $name $_tol1 $_tol2 $_verbose makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler # set m2 "_2" diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl index d514cfe2..cd60cb95 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl @@ -2086,8 +2086,13 @@ proc add_sct_ls340 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {_verbose 0} } if {[ catch { set _ls340_LSmodel 340 - puts "\nadd_ls340: makesctcontroller $name std ${IP}:$port for Lakeshore model $_ls340_LSmodel" - makesctcontroller sct_ls340_$name std ${IP}:$port $terminator + if {[string equal -nocase "aqadapter" "${IP}"]} { + puts "\nadd_ls340: makesctcontroller sct_ls340_$name aqadapter ${port} for Lakeshore model 340" + makesctcontroller sct_ls340_$name aqadapter ${port} + } else { + puts "\nadd_ls340: makesctcontroller sct_ls340_$name std ${IP}:$port $terminator for Lakeshore model 340" + makesctcontroller sct_ls340_$name std ${IP}:$port $terminator + } mk_sct_lakeshore_340 sct_ls340_$name environment $name $_ls340_LSmodel $_tol1 $_tol2 $_verbose makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler # set m2 "_2" 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 b654085b..3bb9782f 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl @@ -904,7 +904,14 @@ namespace eval ::scobj::[set vendor]_[set device] { debug_log 1 "add_[set [ns]::vendor]_[set [ns]::device] ${name} ${IP} ${port} ${_tol}" if {[SplitReply [environment_simulation]]=="false"} { debug_log 1 "makesctcontroller sct_ls370_${name} std ${IP}:${port}" - makesctcontroller sct_ls370_${name} std ${IP}:${port} "\r\n" + if {[string equal -nocase "aqadapter" "${IP}"]} { + # dcl 2013-05-27: in this case the port is the name of the AsyncQueue + puts "\nadd_ls370: makesctcontroller sct_ls370_$name aqadapter ${port} for Lakeshore model 370" + makesctcontroller sct_ls370_$name aqadapter ${port} + } else { + puts "\nadd_ls370: makesctcontroller sct_ls370_$name std ${IP}:$port $terminator for Lakeshore model 370" + makesctcontroller sct_ls370_$name std ${IP}:$port $terminator + } } debug_log 1 "mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}" mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}