linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This was done to facilitate implementation of the nguide guide selection command.
Also fixed miscount of collimator sections.
This commit is contained in:
Ferdi Franceschini
2014-06-17 07:17:23 +10:00
parent e817fc9ed7
commit c00c317b69
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/bilby/config/anticollider/anticollider.tcl
View File

@ -9,11 +9,11 @@ namespace eval ::anticollider {
set coltol 0.5 set coltol 0.5
set aptol 0.1 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" { foreach {col ap} "pc$n ap$n" {
set col_limit [expr [SplitReply [$col posit2unit $aperture_posit]] - $coltol] set col_limit [expr [SplitReply [$col posit2unit $aperture_posit]] - $coltol]
set ap_limit [expr [SplitReply [$ap posit2unit $apD10_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} }] set acrule [subst {forbid {5 inf} for $ap when $col in {-inf $col_limit} }]
lappend ::anticollider::veto_rules $acrule lappend ::anticollider::veto_rules $acrule
set acrule [subst {forbid {-inf inf} for $col when $ap in {$ap_limit inf} }] set acrule [subst {forbid {-inf inf} for $col when $ap in {$ap_limit inf} }]
lappend ::anticollider::veto_rules $acrule lappend ::anticollider::veto_rules $acrule