From 03c00623ee99bbffc1c02ccf3706ee9ce5460597 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 28 Nov 2013 10:24:21 +1100 Subject: [PATCH] Allow two LS336 and two LS340 temperature controllers to be selected. --- .../temperature/sct_lakeshore_336.tcl | 30 ++++++++++----- .../temperature/sct_lakeshore_340.tcl | 30 ++++++++++----- .../temperature/sct_lakeshore_370.tcl | 12 +++--- .../instrument/hipd/util/sics_config.ini | 38 ++++++++++++++++--- .../instrument/tas/util/sics_config.ini | 6 +-- 5 files changed, 83 insertions(+), 33 deletions(-) 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 8724579f..968d16cf 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl @@ -1913,15 +1913,27 @@ proc add_sct_ls336 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {CID 1} {CTY if {[ catch { if { [ info exists ::config_dict ] } { - if { [ dict get $::config_dict ls336 enabled ] } { - set IP [dict get $::config_dict ls336 ip] - set PORT [dict get $::config_dict ls336 port] - set name [dict get $::config_dict ls336 name] - set ctype [dict get $::config_dict ls336 type] - set cid [dict get $::config_dict ls336 id] - set term [dict get $::config_dict ls336 terminator] - set tol1 [dict get $::config_dict ls336 tol1] - set tol2 [dict get $::config_dict ls336 tol2] + if { [ dict get $::config_dict ls336_1 enabled ] } { + set IP [dict get $::config_dict ls336_1 ip] + set PORT [dict get $::config_dict ls336_1 port] + set name [dict get $::config_dict ls336_1 name] + set ctype [dict get $::config_dict ls336_1 type] + set cid [dict get $::config_dict ls336_1 id] + set term [dict get $::config_dict ls336_1 terminator] + set tol1 [dict get $::config_dict ls336_1 tol1] + set tol2 [dict get $::config_dict ls336_1 tol2] + + add_sct_ls336 $name $IP $PORT $term $tol1 $tol2 $cid $ctype + } + if { [ dict get $::config_dict ls336_2 enabled ] } { + set IP [dict get $::config_dict ls336_2 ip] + set PORT [dict get $::config_dict ls336_2 port] + set name [dict get $::config_dict ls336_2 name] + set ctype [dict get $::config_dict ls336_2 type] + set cid [dict get $::config_dict ls336_2 id] + set term [dict get $::config_dict ls336_2 terminator] + set tol1 [dict get $::config_dict ls336_2 tol1] + set tol2 [dict get $::config_dict ls336_2 tol2] add_sct_ls336 $name $IP $PORT $term $tol1 $tol2 $cid $ctype } 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 c6fbadf1..38fc2e21 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl @@ -2117,15 +2117,27 @@ proc add_sct_ls340 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {CID 1} {CTY if {[ catch { if { [ info exists ::config_dict ] } { - if { [ dict get $::config_dict ls340 enabled ] } { - set IP [dict get $::config_dict ls340 ip] - set PORT [dict get $::config_dict ls340 port] - set name [dict get $::config_dict ls340 name] - set ctype [dict get $::config_dict ls340 type] - set cid [dict get $::config_dict ls340 id] - set term [dict get $::config_dict ls340 terminator] - set tol1 [dict get $::config_dict ls340 tol1] - set tol2 [dict get $::config_dict ls340 tol2] + if { [ dict get $::config_dict ls340_1 enabled ] } { + set IP [dict get $::config_dict ls340_1 ip] + set PORT [dict get $::config_dict ls340_1 port] + set name [dict get $::config_dict ls340_1 name] + set ctype [dict get $::config_dict ls340_1 type] + set cid [dict get $::config_dict ls340_1 id] + set term [dict get $::config_dict ls340_1 terminator] + set tol1 [dict get $::config_dict ls340_1 tol1] + set tol2 [dict get $::config_dict ls340_1 tol2] + + add_sct_ls340 $name $IP $PORT $term $tol1 $tol2 $cid $ctype + } + if { [ dict get $::config_dict ls340_2 enabled ] } { + set IP [dict get $::config_dict ls340_2 ip] + set PORT [dict get $::config_dict ls340_2 port] + set name [dict get $::config_dict ls340_2 name] + set ctype [dict get $::config_dict ls340_2 type] + set cid [dict get $::config_dict ls340_2 id] + set term [dict get $::config_dict ls340_2 terminator] + set tol1 [dict get $::config_dict ls340_2 tol1] + set tol2 [dict get $::config_dict ls340_2 tol2] add_sct_ls340 $name $IP $PORT $term $tol1 $tol2 $cid $ctype } 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 3efef3f9..7a467b41 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl @@ -948,13 +948,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_2 enabled ] } { +if { [ info exists ::config_dict ] && [ dict get $::config_dict ls370 enabled ] } { puts "ADD LAKESHORE 370" - 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] + 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] add_lakeshore_370 $NAME $IP $PORT $TOL } diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index 75a177d9..d2ae2724 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -13,11 +13,11 @@ type = B id = 1 port = 55001 -[ls336] +[ls336_1] desc = "tc1: Lakeshore 336 temperature controller" enabled = False group = environment:temperature -ip = 10.157.201.85 +ip = 137.157.201.85 name = tc1 type = T id = 1 @@ -26,19 +26,45 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[ls340] -desc = "tc1: Lakeshore 340 temperature controller" +[ls336_2] +desc = "tc2: Lakeshore 336 temperature controller" +enabled = False +group = environment:temperature +ip = 137.157.201.87 +name = tc2 +type = T +id = 2 +port = 7777 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 + +[ls340_1] +desc = "tc3: Lakeshore 340 temperature controller" enabled = False group = environment:temperature ip = 137.157.201.86 -name = tc1 +name = tc3 type = T -id = 1 +id = 3 port = 4001 terminator = \r\n tol1 = 1.0 tol2 = 1.0 +[ls340_2] +desc = "tc4: Lakeshore 340 temperature controller" +enabled = False +group = environment:temperature +ip = 137.157.201.86 +name = tc4 +type = T +id = 4 +port = 4002 +terminator = \r\n +tol1 = 1.0 +tol2 = 1.0 + [mercury_itc500] addr = @1 desc = "tc1: Oxford Mercury temperature controller in legacy mode" diff --git a/site_ansto/instrument/tas/util/sics_config.ini b/site_ansto/instrument/tas/util/sics_config.ini index c354f979..13022ad0 100644 --- a/site_ansto/instrument/tas/util/sics_config.ini +++ b/site_ansto/instrument/tas/util/sics_config.ini @@ -13,7 +13,7 @@ cascade = 12tmagnet,s1_sample_insert,mercury_scipi enabled = False group = 0setup -[ls336] +[ls336_1] desc = "tc2: Lakeshore 336 temperature controller" enabled = False group = environment:temperature @@ -26,7 +26,7 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[ls340] +[ls340_1] desc = "tc1: Lakeshore 340 temperature controller" enabled = False group = environment:temperature @@ -39,7 +39,7 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[ls370_2] +[ls370] desc = "tc3: Lakeshore 370 temperature controller" enabled = False group = environment:temperature