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

2
site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
View File

@@ -248,6 +248,7 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
MakeSICSObj ${name} SCT_OBJECT
sicslist setatt ${name} driver astrium_chopper
sicslist setatt ${name} klass ${device_class}
sicslist setatt ${name} long_name ${name}
@@ -624,6 +625,7 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/disk_4 data "true"
hsetprop ${scobj_hpath}/disk_4 klass "@none"
hsetprop ${scobj_hpath}/disk_4 type "part"
hsetprop ${scobj_hpath} driver astrium_chopper
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5