Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
2008-05-30 10:26:57 +10:00
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions
--- a/site_ansto/instrument/sans/config/anticollider/acscript.txt
+++ b/site_ansto/instrument/sans/config/anticollider/acscript.txt
@@ -0,0 +1,3 @@
+# Forbid detector motion when the detector voltage is on
+forbid {-inf inf} for det    when dhv1 in {20 inf}
+forbid {-inf inf} for detoff when dhv1 in {20 inf}