From 04906c8ca5d700f8cbee8c499034b7dbb310024d Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 31 Jan 2014 14:00:23 +1100 Subject: [PATCH] The aperture arm must be up to allow driving the guide. Low encoder values = aperture arm up. --- .../bilby/config/anticollider/anticollider.tcl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl b/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl index 9638485d..a71d2fa1 100644 --- a/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl +++ b/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl @@ -5,18 +5,18 @@ source $cfPath(anticollider)/anticollider_common.tcl namespace eval ::anticollider { set guide_posit 1 set aperture_posit 2 - set ap100X100_posit 1 - set coltol 0.1 + set apD10_posit 5 + set coltol 0.5 set aptol 0.1 for {set n 1} {$n < 8} {incr n} { - foreach {col ap} "col$n ap$n ap$n col$n" { + foreach {col ap} "col$n ap$n" { set col_limit [expr [SplitReply [$col posit2unit $aperture_posit]] - $coltol] - set ap_limit [expr [SplitReply [$ap posit2unit $ap100X100_posit]] - $aptol] + set ap_limit [expr [SplitReply [$ap posit2unit $apD10_posit]] + $aptol] set acrule [subst {forbid {-inf inf} for $ap when $col in {-inf $col_limit} }] lappend ::anticollider::prog $acrule clientput $acrule - set acrule [subst {forbid {-inf inf} for $col when $ap in {-inf $ap_limit} }] + set acrule [subst {forbid {-inf inf} for $col when $ap in {$ap_limit inf} }] lappend ::anticollider::prog $acrule clientput $acrule }