SICS-697 Make named links in data group for LS336 and Oxford Mercury.

SICS-705 Fixed log file name bug in Mercury controller.

site_ansto/instrument/tas/util/sics_config.ini

@@ -13,7 +13,20 @@ cascade = 12tmagnet,s1_sample_insert,mercury_scipi
 enabled = False
 group = 0setup
 
-[ls340_1]
+[ls336]
+desc = "tc2: Lakeshore 336 temperature controller"
+enabled = False
+group = environment:temperature
+ip = 10.157.xxx.xxx
+name = tc2
+type = T
+id   = 2
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
+[ls340]
 desc = "tc1: Lakeshore 340 temperature controller"
 enabled = False
 group = environment:temperature
@@ -27,13 +40,13 @@ tol1 = 1.0
 tol2 = 1.0
 
 [ls370_2]
-desc = "tc2: Lakeshore 370 temperature controller"
+desc = "tc3: Lakeshore 370 temperature controller"
 enabled = False
 group = environment:temperature
 ip = 137.157.203.137
-name = tc2
+name = tc3
 type = T
-id   = 2
+id   = 3
 port = 4003
 terminator = \r\n
 tol = 2.0
@@ -62,6 +75,7 @@ id   = 9
 offifon = mercury_itc500
 port = 7020
 tol = 2.0
+terminator = \r
 
 [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"
@@ -72,7 +86,7 @@ group = motors
 desc = "tc1: Blue furnace temperature controller"
 enabled = False
 group = environment:temperature
-ip = 137.157.203.141
+ip = 10.157.205.19
 name = tc1
 type = T
 id   = 1