linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring config INI files up to date with new drivers and fix some errors.

Browse Source
This commit is contained in:
Ferdi Franceschini
2015-03-13 13:09:15 +11:00
parent 88c1f007fa
commit 25d73eb17a
13 changed files with 322 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
site_ansto/instrument/hipd/util/sics_config.ini
View File

@@ -1,5 +1,5 @@
[12tmagnet_setup]
cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_01
enabled = False
[Autolab_setup]
cascade = sample_stage:normal_sample_stage,I1:protek_01,V1:protek_02
@@ -7,12 +7,18 @@ enabled = False
[CF1]
cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
enabled = False
[CF7]
cascade = T1:ls336_08,T2:ls336_05,sample_stage:normal_sample_stage
enabled = False
[CF8]
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage
enabled = False
[Default]
cascade = sample_stage:normal_sample_stage
enabled = True
[F5 Low Temperature Vacuum Furnace]
cascade = T1:eurotherm,sample_stage:normal_sample_stage
enabled = False
[B1]
datype = B
enabled = False
@@ -27,6 +33,13 @@ id = 1
implementation = none
name = pulser
optype = function_generator
[HE3]
datype = X
enabled = False
id = 1
implementation = none
name = he3
optype = polariser
[I1]
datype = I
enabled = False
@@ -131,12 +144,53 @@ desc = "Function Generator"
driver = agilent_33220A
imptype = function_generator
ip = 10.157.205.16
name = pulser
port = 5025
[eulerian_cradle]
desc = "Load the Eulerian cradle configuration"
imptype = motion_axis
[eurotherm]
asyncprotocol = "modbus_ap"
desc = "Eurotherm temperature controller"
dev_id = 1
driver = "eurotherm_3200"
imptype = temperature
ip = 10.157.205.19
port = 502
tol = 1.0
[he3_analyser]
desc = "3He Analyser"
driver = "he3_polanal"
has_anal = true
has_pol = false
imptype = polariser
ip = 10.157.205.2
port = 55013
terminator = \r\n
[he3_both]
desc = "3He Pol+Anal"
driver = "he3_polanal"
has_anal = true
has_pol = true
imptype = polariser
ip = 10.157.205.2
port = 55013
terminator = \r\n
[he3_polariser]
desc = "3He Polariser"
driver = "he3_polanal"
has_anal = false
has_pol = true
imptype = polariser
ip = 10.157.205.2
port = 55013
terminator = \r\n
[ls336_01]
asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
@@ -175,7 +229,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 137.157.201.21
ip = 10.157.205.54
port = 7777
terminator = \r\n
tol1 = 1.0
@@ -186,7 +240,28 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 10.157.205.30
ip = 10.157.205.61
port = 7777
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls336_08]
asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 10.157.205.55
port = 7777
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls336_10]
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 10.157.205.26
port = 7777
terminator = \r\n
tol1 = 1.0
@@ -263,6 +338,7 @@ ip = 10.157.205.5
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -276,6 +352,7 @@ ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -289,6 +366,7 @@ ip = 10.157.205.47
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@@ -316,7 +394,7 @@ port = 4001
desc = "Load the small omega configuration"
imptype = motion_axis
[vf1_west4100]
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
@@ -325,7 +403,7 @@ imptype = temperature
ip = 10.157.205.24
port = 502
[vf2_west4100]
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1

1
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -42,7 +42,6 @@ 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_oxford_mercury.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)/temperature/sct_julabo_lh45_gen.tcl