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/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
This commit is contained in:
Douglas Clowes
2015-03-05 13:53:47 +11:00
parent b75e0b5efb 06c51416dd
commit f269a17ef3
41 changed files with 1967 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
site_ansto/instrument/sans/config/environment/sct_rheometer.tcl
View File

@@ -100,4 +100,5 @@ proc add_rheo {rhControl tol settle} {
hfactory /sics/$rhControl/settletime plain user float
hset /sics/$rhControl/settletime $settle
hsetprop /sics/$rhControl timecheck 0
hsetprop /sics/$rhControl callBack "rhCallBack /sics/$rhControl"
}

4
site_ansto/instrument/sans/config/motors/motor_configuration.tcl
View File

@@ -718,7 +718,7 @@ Motor apx $motor_driver_type [params \
axis E\
units mm\
hardlowerlim -260\
hardupperlim 5\
hardupperlim 45\
maxSpeed 5\
maxAccel 5\
maxDecel 5\
@@ -730,7 +730,7 @@ apx part collimator
apx long_name apx
apx home 0
apx softlowerlim -255
apx softupperlim 5
apx softupperlim 45
apx speed 5
# Sample aperture y