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

Merge branch 'RELEASE-3_1'

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
This commit is contained in:
Douglas Clowes
2014-11-06 14:13:20 +11:00
parent 2076c0a5fc 8a61f65701
commit 3ce5ae0977
52 changed files with 4133 additions and 3116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/kookaburra/config/parameters/parameters.tcl
View File

@@ -10,7 +10,10 @@ foreach {var lname type priv units klass} {
wavelength wavelength float user Angstrom crystal
dOmega dOmega float user degrees crystal
gDQv gDQv float user none crystal
gDQh gDQh float user none crystal
scan_variable scan_variable text user none crystal
MainDeadTime MainDeadTime float user s detector
TransBackground TransBackground int user none detector
TransDeadTime TransDeadTime float user s detector
TransmissionTube TransmissionTube int user none detector
bkgLevel bkgLevel float user 1 experiment