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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-09-01 13:23:21 +10:00
parent 679838eac3 2b73a7eaca
commit c3bb4a9591
69 changed files with 3633 additions and 1057 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
imptype = function_generator
ip = 10.157.205.16
name = pulser
port = 5025
[eularian_cradle]
@@ -254,27 +253,44 @@ ip = 10.157.205.42
port = 4001
tol = 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
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
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
ttol = 1.0
vtol = 5
[normal_sample_stage]
desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages"

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

@@ -40,7 +40,6 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/ls340_sct.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/lakeshore_m370_sct.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/protekmm_sct.tcl