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

Pull various config files closer into alignment

Browse Source
This commit is contained in:
Douglas Clowes
2014-11-20 15:56:30 +11:00
parent 7269314220
commit f629ea24ed
8 changed files with 128 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,6 @@ desc = "Function Generator"
driver = agilent_33220A driver = agilent_33220A
imptype = function_generator imptype = function_generator
ip = 10.157.205.16 ip = 10.157.205.16
name = pulser
port = 5025 port = 5025
[eularian_cradle] [eularian_cradle]
@ -254,27 +253,44 @@ ip = 10.157.205.42
port = 4001 port = 4001
tol = 1.0 tol = 1.0
[mercury_scpi_01] [mercury_01]
desc = "Oxford Mercury temperature controller in Mercury mode" assoc = 00000124
driver = "mercury_scpi" cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.5 ip = 10.157.205.5
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[mercury_scpi_02] [mercury_02]
desc = "Oxford Mercury temperature controller in Mercury mode" assoc = 00000124
driver = "mercury_scpi" cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.47 ip = 10.157.205.47
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[normal_sample_stage] [normal_sample_stage]
desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages"

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

@ -40,11 +40,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.tcl fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.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)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/sct_protekmm.tcl

6
site_ansto/instrument/hrpd/echidna_configuration.tcl
View File

@ -40,11 +40,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.tcl fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.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)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/sct_protekmm.tcl

45
site_ansto/instrument/hrpd/util/sics_config.ini
View File

@ -233,27 +233,44 @@ ip = 10.157.205.42
port = 4001 port = 4001
tol = 1.0 tol = 1.0
[mercury_scpi_01] [mercury_01]
desc = "Oxford Mercury temperature controller in Mercury mode" assoc = 00000124
driver = "mercury_scpi" cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.5 ip = 10.157.205.5
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[mercury_scpi_02] [mercury_02]
desc = "Oxford Mercury temperature controller in Mercury mode" assoc = 00000124
driver = "mercury_scpi" cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.47 ip = 10.157.205.47
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[normal_sample_stage] [normal_sample_stage]
desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages"

7
site_ansto/instrument/pelican/pelican_configuration.tcl
View File

@ -42,12 +42,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.tcl fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.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)/sct_protek_common.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/sct_protekmm.tcl
fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl

45
site_ansto/instrument/pelican/util/sics_config.ini
View File

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

7
site_ansto/instrument/tas/taipan_configuration.tcl
View File

@ -48,15 +48,10 @@ fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(environment)/he3/sct_he3.tcl
fileeval $cfPath(environment)/magneticField/oxford_labview.tcl fileeval $cfPath(environment)/magneticField/oxford_labview.tcl
fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl
fileeval $cfPath(environment)/he3/sct_he3.tcl
fileeval config/load_setup.tcl fileeval config/load_setup.tcl
fileeval log.tcl fileeval log.tcl
publish logbook spy publish logbook spy

46
site_ansto/instrument/tas/util/sics_config.ini
View File

@ -124,7 +124,6 @@ desc = "Function Generator"
driver = agilent_33220A driver = agilent_33220A
imptype = function_generator imptype = function_generator
ip = 10.157.205.16 ip = 10.157.205.16
name = pulser
port = 5025 port = 5025
[ls336_01] [ls336_01]
@ -235,27 +234,44 @@ terminator = \r\n
tol1 = 1.0 tol1 = 1.0
tol2 = 1.0 tol2 = 1.0
[mercury_scpi_01] [mercury_01]
desc = "Oxford Mercury temperature controller with three temperature loops." assoc = 00000124
driver = "mercury_base" cards = HHHVLTTP
desc = "Oxford Mercury temperature controller (12T)"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.5 ip = 10.157.205.5
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[mercury_scpi_02] [mercury_02]
desc = "Oxford Mercury temperature controller with four temperature loops and needle valve control" assoc = 00000124
driver = "mercury_scpi" cards = HHTVTTTP
desc = "Oxford Mercury temperature controller (CF10)"
driver = "oxford_mercury"
imptype = temperature
ip = 10.157.205.46
port = 7020
ptol = 5
terminator = \n
ttol = 1.0
vtol = 5
[mercury_03]
assoc = 00000123
cards = HHHNNTTT
desc = "Oxford Mercury temperature controller ()"
driver = "oxford_mercury"
imptype = temperature imptype = temperature
ip = 10.157.205.47 ip = 10.157.205.47
permlink = LT
port = 7020 port = 7020
terminator = \r\n ptol = 5
tol = 1.0 terminator = \n
valve_tol = 2 ttol = 1.0
vtol = 5
[normal_sample_stage] [normal_sample_stage]
desc = "This is the default sample stage configuration" desc = "This is the default sample stage configuration"