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

Enabled detector carriage anticollider rule.

Browse Source
This commit is contained in:
Ferdi Franceschini
2014-06-10 19:27:18 +10:00
parent 70e9ce99e4
commit df7ad295ed
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,18 +34,17 @@ namespace eval ::anticollider {
# set proximity_rules {
# ss1l ss1r 10
# }
# TODO UNCOMMENT FOLLOWING TO ENABLE ANTICOLLISION FOR DETECTOR CARRIAGES
# # Detector carriage proximity rules.
# # det1 = curtain detector
# # det2 = main detector which is at higher y-pos then det1
# set proximity_rules {
# det1 det2 2000
# }
# foreach {m1 m2 minsep} $proximity_rules {
# anticollision register $m1
# anticollision register $m2
# clientput "::anticollider::proximity_rule: $m1 $m2 minsep = $minsep"
# }
# Detector carriage proximity rules.
# curtaindet = curtain detector
# det = main detector which is at higher y-pos then curtaindet
set proximity_rules "
curtaindet det $::carriage_minsep
"
foreach {m1 m2 minsep} $proximity_rules {
anticollision register $m1
anticollision register $m2
clientput "::anticollider::proximity_rule: $m1 $m2 minsep = $minsep"
}
}
# @brief Don't allow two axes to get closer than a minimum separation given in the 'proximity_rules' list.
@ -60,7 +59,7 @@ namespace eval ::anticollider {
if {[info exists proximity_rules] == 0} {
return
} elseif {[len $proximity_rules] == 0} {
} elseif {[llength $proximity_rules] == 0} {
return
}
foreach {m1 m2 mdist} $proximity_rules {