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

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

View File

@ -33,16 +33,12 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(environment)/temperature/sct_ls336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl
fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(environment)/temperature/sct_west4100.tcl
fileeval $cfPath(environment)/temperature/sct_west_6100.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl

View File

@ -145,27 +145,47 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[mercury_scpi_01]
desc = "Oxford Mercury temperature controller with three temperature loops."
driver = "mercury_base"
[mercury_01]
assoc = 00000124
cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.5
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_scpi_02]
desc = "Oxford Mercury temperature controller with four temperature loops and needle valve control"
driver = "mercury_scpi"
[mercury_02]
assoc = 00000124
cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.47
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[normal_sample_stage]
desc = "This is the default sample stage configuration"

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

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

View File

@ -1,12 +1,15 @@
[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
[CF1]
cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
enabled = False
[CF8]
[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
@ -107,8 +110,9 @@ optype = motion_axis
[12tmagnet_oxford]
asyncqueue = sct
desc = "12 Tesla Oxford Magnet"
driver = "oxford_labview"
driver = "oxford12tlv"
imptype = magnetic_field
interval = 5
ip = 10.157.205.3
port = 55001
@ -187,7 +191,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 137.157.201.21
ip = 10.157.205.61
port = 7777
terminator = \r\n
tol1 = 1.0
@ -225,6 +229,38 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_01]
asyncqueue = sct
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4001
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_02]
asyncqueue = sct
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4002
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls340_11]
desc = "Lakeshore 340 temperature controller"
driver = "ls340"
imptype = temperature
ip = 137.157.201.86
port = 4001
terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[ls370_1]
desc = "Lakeshore 370 Resistance Bridge"
driver = "lakeshore_m370"
@ -243,6 +279,7 @@ ip = 10.157.205.5
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@ -256,6 +293,7 @@ ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@ -269,6 +307,7 @@ ip = 10.157.205.47
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
@ -314,10 +353,21 @@ robot_name = rosie
desc = "Load the small omega configuration"
imptype = motion_axis
[west4100]
desc = "Blue furnace temperature controller"
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
driver = "west_6100"
imptype = temperature
ip = 10.157.205.19
ip = 10.157.205.24
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west_6100"
imptype = temperature
ip = 10.157.205.25
port = 502

View File

@ -36,13 +36,8 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
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_mercury_base.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl
fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl
fileeval $cfPath(environment)/sct_rheometer.tcl

View File

@ -173,27 +173,47 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[mercury_scpi_01]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_01]
assoc = 00000124
cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.5
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_scpi_02]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_02]
assoc = 00000124
cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.47
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[normal_sample_stage]
desc = "This is the default sample stage configuration xyz translation omega rotation but no tilt axes"

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
[CF3]
cascade = T1:ls340_pelican,sample_stage:normal_sample_stage
@ -181,7 +181,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 137.157.201.21
ip = 10.157.205.61
port = 7777
terminator = \r\n
tol1 = 1.0
@ -262,6 +262,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[mercury_02]
assoc = 00000124
@ -275,6 +276,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[mercury_03]
assoc = 00000123
@ -288,6 +290,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[normal_sample_stage]
desc = "This is the default sample stage configuration"
@ -309,10 +312,20 @@ imptype = multimeter
ip = 10.157.205.37
port = 4001
[west4100]
desc = "Blue furnace temperature controller"
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
driver = "west_6100"
imptype = temperature
ip = 10.157.205.19
ip = 10.157.205.24
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west_6100"
imptype = temperature
ip = 10.157.205.25
port = 502

View File

@ -41,6 +41,7 @@ fileeval $cfPath(environment)/temperature/sct_ls336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(hmm)/detector.tcl

View File

@ -235,27 +235,47 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[mercury_scpi_01]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_01]
assoc = 00000124
cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.5
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_scpi_02]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_02]
assoc = 00000124
cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.47
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mvp]
desc = "Valve controller"

View File

@ -41,7 +41,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
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_mercury_scpi.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/sct_nhq_200.tcl
fileeval $cfPath(environment)/sct_omron_hldc.tcl
fileeval $cfPath(environment)/temperature/sct_pfeiffer_hg.tcl
@ -55,6 +55,7 @@ fileeval $cfPath(environment)/temperature/sct_watlow_rm.tcl
fileeval $cfPath(environment)/temperature/sct_watlow_mrm.tcl
fileeval $cfPath(environment)/temperature/sct_watlow_st4.tcl
fileeval $cfPath(environment)/temperature/sct_watlow_mst4.tcl
fileeval $cfPath(environment)/temperature/sct_west_6100.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(hmm)/detector.tcl

View File

@ -2,7 +2,7 @@
cascade = T1:watlow_rm,sample_stage:10_pos_sample_stage
enabled = False
[12Tmagnet_setup]
cascade = B1:12tmagnet_oxford,sample_stage:Oxford_12tmagnet_sample_insert,T1:mercury_scpi_01
cascade = B1:12tmagnet_oxford,sample_stage:Oxford_12tmagnet_sample_insert,T1:mercury_01
enabled = False
[20_position_pulser]
cascade = T1:julabo_lh45,Function_Generator:agilent_33220A,High_Voltage:protek_02,sample_stage:20_pos_sample_stage
@ -315,7 +315,7 @@ asyncqueue = sct
desc = "Lakeshore 336 temperature controller"
driver = "ls336"
imptype = temperature
ip = 137.157.201.21
ip = 10.157.205.61
port = 7777
terminator = \r\n
tol1 = 1.0
@ -374,27 +374,47 @@ terminator = \r\n
tol1 = 1.0
tol2 = 1.0
[mercury_scpi_01]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_01]
assoc = 00000124
cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.5
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_scpi_02]
desc = "Oxford Mercury temperature controller in Mercury mode"
driver = "mercury_scpi"
[mercury_02]
assoc = 00000124
cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.47
permlink = LT
port = 7020
terminator = \r\n
tol = 1.0
valve_tol = 2
ptol = 5
terminator = \n
timeout = 2000
ttol = 1.0
vtol = 5
[newport_rva]
desc = "Newport Rapid Visco-Analyser"
@ -433,10 +453,20 @@ terminator = \r\n
tol = 0.5
type = T
[west4100]
desc = "Blue furnace temperature controller"
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
driver = "west_6100"
imptype = temperature
ip = 10.157.205.19
ip = 10.157.205.24
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west_6100"
imptype = temperature
ip = 10.157.205.25
port = 502

View File

@ -273,7 +273,7 @@ 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
@ -363,6 +363,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[mercury_02]
assoc = 00000124
@ -376,6 +377,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[mercury_03]
assoc = 00000123
@ -389,6 +391,7 @@ ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
timeout = 2000
[normal_m2s2]
desc = "This sets speed and acceleration for the default extension of the m2 and s2 axes"
@ -414,15 +417,6 @@ imptype = multimeter
ip = 10.157.205.37
port = 4001
[vf1_west4100]
asyncqueue = sct
desc = "VF1 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
imptype = temperature
ip = 10.157.205.24
port = 502
[vf1_west6100]
asyncprotocol = modbus_ap
desc = "VF1 Blue furnace 6100 temperature controller"
@ -433,15 +427,6 @@ ip = 10.157.205.24
port = 502
timeout = 2000
[vf2_west4100]
asyncqueue = sct
desc = "VF2 Blue furnace temperature controller"
dev_id = 1
driver = "west4100"
imptype = temperature
ip = 10.157.205.25
port = 502
[vf2_west6100]
asyncprotocol = modbus_ap
desc = "VF2 Blue furnace 6100 temperature controller"