Changed aperture rule to allow driving apertures up past 5 degrees.

This was done to facilitate implementation of the nguide guide selection command.
Also fixed miscount of collimator sections.

site_ansto/instrument/bilby/config/anticollider/anticollider.tcl

@@ -9,11 +9,11 @@ namespace eval ::anticollider {
   set coltol 0.5
   set aptol 0.1
 
-  for {set n 1} {$n < 8} {incr n} {
+  for {set n 1} {$n <= 8} {incr n} {
     foreach {col ap} "pc$n ap$n" {
       set col_limit [expr [SplitReply [$col posit2unit $aperture_posit]] - $coltol]
       set ap_limit [expr [SplitReply [$ap posit2unit $apD10_posit]] - $aptol]
-      set acrule [subst {forbid {-inf inf} for $ap when $col in {-inf $col_limit} }]
+      set acrule [subst {forbid {5 inf} for $ap when $col in {-inf $col_limit} }]
       lappend ::anticollider::veto_rules $acrule
       set acrule [subst {forbid {-inf inf} for $col when $ap in {$ap_limit inf} }]
       lappend ::anticollider::veto_rules $acrule