From 35ea3704b7a43b0d5bf94e857ebff9af42322d47 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Fri, 17 Oct 2014 16:35:38 +1100
Subject: [PATCH] Load available environment controller configurations for
 kowari

---
 .../instrument/rsd/kowari_configuration.tcl   | 23 ++++++++++++---
 .../instrument/rsd/util/sics_config.ini       | 28 -------------------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/site_ansto/instrument/rsd/kowari_configuration.tcl b/site_ansto/instrument/rsd/kowari_configuration.tcl
index 0ef12ec1..ec763a80 100644
--- a/site_ansto/instrument/rsd/kowari_configuration.tcl
+++ b/site_ansto/instrument/rsd/kowari_configuration.tcl
@@ -23,12 +23,27 @@ source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(motors)/positmotor_configuration.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
-fileeval $cfPath(environment)/sct_keithley_2700.tcl
-fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
+fileeval $cfPath(environment)/sct_agilent_33220A.tcl
+fileeval $cfPath(environment)/sct_isotech_ps.tcl
 fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
+fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl
+fileeval $cfPath(environment)/sct_keithley_2700.tcl
+fileeval $cfPath(environment)/sct_keithley_m2700.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
+fileeval $cfPath(environment)/temperature/sct_ls336.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
+fileeval $cfPath(environment)/temperature/sct_ls340.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
+fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
 fileeval $cfPath(environment)/sct_protek_common.tcl
+fileeval $cfPath(environment)/sct_protekmm.tcl
 fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
 fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
diff --git a/site_ansto/instrument/rsd/util/sics_config.ini b/site_ansto/instrument/rsd/util/sics_config.ini
index f8aa9b8d..bd3b1e37 100644
--- a/site_ansto/instrument/rsd/util/sics_config.ini
+++ b/site_ansto/instrument/rsd/util/sics_config.ini
@@ -80,34 +80,6 @@ tol1 = 1.0
 tol2 = 1.0
 type = T
 
-[ls336_5]
-desc = "tc5: Lakeshore 336 temperature controller"
-driver = "ls336"
-enabled = False
-group = environment:temperature
-id = 5
-ip = 137.157.201.21
-name = tc5
-port = 7777
-terminator = \r\n
-tol1 = 1.0
-tol2 = 1.0
-type = T
-
-[ls336_6]
-desc = "tc6: Lakeshore 336 temperature controller"
-driver = "ls336"
-enabled = False
-group = environment:temperature
-id = 6
-ip = 137.157.201.21
-name = tc6
-port = 7777
-terminator = \r\n
-tol1 = 1.0
-tol2 = 1.0
-type = T
-
 [mercury_scpi]
 desc = "tc25: Oxford Mercury temperature controller in Mercury mode"
 driver = "mercury_scpi"