From df7ad295ed9d1215d1d50d102dffa87048c7a4c2 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Tue, 10 Jun 2014 19:27:18 +1000
Subject: [PATCH] Enabled detector carriage anticollider rule.

---
 .../config/anticollider/anticollider.tcl      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl b/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl
index 9f71c286..6ae22e4d 100644
--- a/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl
+++ b/site_ansto/instrument/bilby/config/anticollider/anticollider.tcl
@@ -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 {