Pullback sics_config changes from Quokka

This commit is contained in:
Douglas Clowes
2014-09-10 15:15:53 +10:00
parent 5ce8677195
commit f4eb6c63d8

View File

@ -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"