From 3366f21421251afe984671aba7aa1af7f90205c0 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Tue, 15 Oct 2013 03:26:52 +1100
Subject: [PATCH] Taipan: Add LS370 and Mercury to sics_config.ini

---
 .../instrument/tas/util/sics_config.ini       | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/site_ansto/instrument/tas/util/sics_config.ini b/site_ansto/instrument/tas/util/sics_config.ini
index 14cd0d34..ccc5ebcc 100644
--- a/site_ansto/instrument/tas/util/sics_config.ini
+++ b/site_ansto/instrument/tas/util/sics_config.ini
@@ -2,15 +2,17 @@
 desc = "12 Tesla Oxford Magnet"
 enabled = False
 group = environment:magnet
-ip = 137.157.203.153
+ip = 10.157.205.3
+name = magnetic
 port = 55001
 
 [12tmagnet_setup]
-cascade = 12tmagnet,s1_sample_insert
+cascade = 12tmagnet,s1_sample_insert,mercury_scipi
 enabled = False
 group = 0setup
 
 [ls340_1]
+desc = "tc1: Lakeshore 340 temperature controller"
 enabled = False
 group = environment:temperature
 ip = 137.157.203.137
@@ -20,6 +22,37 @@ terminator = "\r\n"
 tol1 = 1.0
 tol2 = 1.0
 
+[ls370_2]
+desc = "tc2: Lakeshore 370 temperature controller"
+enabled = False
+group = environment:temperature
+ip = 137.157.203.137
+name = tc2
+port = 4003
+terminator = "\r\n"
+tol = 2.0
+
+[mercury_itc500]
+addr = @1
+desc = "tc9: Oxford Mercury temperature controller in legacy mode"
+enabled = False
+group = environment:temperature
+ip = 10.157.205.5
+name = tc9
+offifon = mercury_scipi
+port = 7020
+tol = 2.0
+
+[mercury_scipi]
+desc = "tc9: Oxford Mercury temperature controller in Mercury mode"
+enabled = False
+group = environment:temperature
+ip = 10.157.205.5
+name = tc9
+offifon = mercury_itc500
+port = 7020
+tol = 2.0
+
 [s1_sample_insert]
 desc = "s1 will be defined as the sample insert rotation. Sample stage will be renamed to s1ss and sgu and sgl will be simulated"
 enabled = False