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/config/beamline/aerolas_doppler_sct.tcl
View File

@@ -337,6 +337,7 @@ proc ::scobj::aerolas_doppler::mkDriver { sct_controller name device_class simul
MakeSICSObj ${name} SCT_OBJECT
sicslist setatt ${name} driver aerolas_doppler
sicslist setatt ${name} klass ${device_class}
sicslist setatt ${name} long_name ${name}
@@ -4303,6 +4304,7 @@ proc ::scobj::aerolas_doppler::mkDriver { sct_controller name device_class simul
hsetprop ${scobj_hpath}/testing/shorts klass "@none"
hsetprop ${scobj_hpath}/testing/shorts type "part"
}
hsetprop ${scobj_hpath} driver aerolas_doppler
hsetprop ${scobj_hpath} klass ${device_class}
hsetprop ${scobj_hpath} data true
hsetprop ${scobj_hpath} debug_threshold 5