From f4eb6c63d83770194c0438275043d64eb398dd0e Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 10 Sep 2014 15:15:53 +1000
Subject: [PATCH] Pullback sics_config changes from Quokka

---
 .../instrument/sans/util/sics_config.ini      | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/site_ansto/instrument/sans/util/sics_config.ini b/site_ansto/instrument/sans/util/sics_config.ini
index 7257c7a3..2f4734ef 100644
--- a/site_ansto/instrument/sans/util/sics_config.ini
+++ b/site_ansto/instrument/sans/util/sics_config.ini
@@ -4,6 +4,9 @@ enabled = False
 [12Tmagnet_setup]
 cascade = B1:12tmagnet_oxford,sample_stage:Oxford_12tmagnet_sample_insert,T1:mercury_scpi_01
 enabled = False
+[20_position_pulser]
+cascade = T1:julabo_lh45,Function_Generator:agilent_33220A,High_Voltage:protek_02,sample_stage:20_pos_sample_stage
+enabled = False
 [20_position_setup]
 cascade = T1:julabo_lh45,sample_stage:20_pos_sample_stage
 enabled = False
@@ -70,6 +73,13 @@ id = 2
 implementation = none
 name = curr2
 optype = multimeter
+[Power Supply]
+datype = V
+enabled = False
+id = 1
+implementation = none
+name = isops
+optype = power_supply
 [Rheometry]
 enabled = False
 implementation = none
@@ -155,11 +165,19 @@ optype = motion_axis
 desc = "Load the ten position sample changer configuration"
 imptype = motion_axis
 
+[11tmagnet_oxford]
+desc = "11/10 Tesla Oxford Magnet"
+driver = "oxford_labview"
+imptype = magnetic_field
+interval = 5
+ip = 10.157.205.44
+port = 55001
+
 [12tmagnet_oxford]
-asyncqueue = sct
 desc = "12 Tesla Oxford Magnet"
 driver = "oxford_labview"
 imptype = magnetic_field
+interval = 5
 ip = 10.157.205.3
 port = 55001
 
@@ -217,6 +235,13 @@ ip = 10.157.205.13
 port = 4444
 type = B
 
+[isotech_ps]
+desc = "Isotech Power Supply:Baud=2400,Data=8,Stop=1,Parity=None,Flow=None"
+driver = "isotech_ps"
+imptype = power_supply
+ip = 137.157.202.79
+port = 4001
+
 [julabo_lh45]
 ctrl_sensor = "bath"
 desc = "Julabo temperature controller"
@@ -315,6 +340,16 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0
 
+[ls340_09]
+desc = "Lakeshore 340 temperature controller"
+driver = "ls340"
+imptype = temperature
+ip = 137.157.202.79
+port = 4002
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
 [ls340_11]
 desc = "Lakeshore 340 temperature controller"
 driver = "ls340"