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/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps.sct
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/util/gen_sct.py
This commit is contained in:
Douglas Clowes
2014-11-13 13:52:46 +11:00
parent a5116f03e4 5fefe5f009
commit 30c23b1e0a
18 changed files with 678 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
site_ansto/instrument/kookaburra/config/anticollider/acscript.txt
View File

@@ -1,4 +1,9 @@
# Forbid detector motion when the detector voltage is on
# comment out -- Jing
#forbid {-inf inf} for det when dhv1 in {800 inf}
#forbid {-inf inf} for detoff when dhv1 in {800 inf}
# Prevent m2om encoder from driving into sample holder.
forbid {10 inf} for m2om whenall {m2y in {-inf 200} m2om in {-inf 10}}
forbid {-inf 170} for m2om whenall {m2y in {-inf 200} m2om in {170 inf}}
forbid {-inf inf} for m2om whenall {m2y in {-inf 200} m2om in {11 169}}
forbid {-inf 200} for m2y when m2om in {10 170}
# Following two rules allow recovery if m2om position has crept above 10 or below 170
forbid {11 inf} for m2om whenall {m2y in {-inf 200} m2om in {10 11}}
forbid {-inf 169} for m2om whenall {m2y in {-inf 200} m2om in {169 170}}