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
This commit is contained in:
Douglas Clowes
2014-08-18 13:34:56 +10:00
parent c95d2d6885 288be8f1c2
commit 10b7e8029f
16 changed files with 470 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ fileeval $cfPath(environment)/temperature/sct_qlink.tcl
fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(environment)/temperature/west4100_sct.tcl
fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
fileeval $cfPath(environment)/magneticField/oxford12tlv_sct.tcl
fileeval $cfPath(environment)/he3/sct_he3.tcl
fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl

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

@@ -89,9 +89,11 @@ implementation = normal_sample_stage
name = sample_stage
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