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/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-08-06 13:53:18 +10:00
parent 05dc1958ff 639e4dc3c8
commit 507ddafb2a
80 changed files with 2274 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct
View File

@@ -1,5 +1,4 @@
driver astrium_chopper = {
debug_threshold = 2;
vendor = astrium; device = chopper; protocol = std;
class = NXdisk_chopper; simulation_group = chopper_simulation;
@@ -108,6 +107,5 @@ driver astrium_chopper = {
%%}
code mkDriver = {%%
hsetprop ${scobj_hpath} debug_threshold 1
%%}
}