From 3d8fd84f7085d9eabdab9f79c790956ba6477142 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Thu, 20 Feb 2014 14:57:46 +1100
Subject: [PATCH] Move stuff up from collimator to instrument and add virtual
 motors for slits and attentuator

---
 site_ansto/instrument/bilby/config/motors/hdb_info.csv     | 6 +++---
 .../instrument/bilby/config/motors/motor_configuration.tcl | 7 +++++++
 site_ansto/instrument/bilby/config/motors/sct_shutters.tcl | 4 ++--
 site_ansto/instrument/bilby/config/motors/shutters.sct     | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/site_ansto/instrument/bilby/config/motors/hdb_info.csv b/site_ansto/instrument/bilby/config/motors/hdb_info.csv
index b426afba..699dbbc7 100644
--- a/site_ansto/instrument/bilby/config/motors/hdb_info.csv
+++ b/site_ansto/instrument/bilby/config/motors/hdb_info.csv
@@ -14,7 +14,7 @@ ap7_part,collimator
 ap7_units,degrees
 ap8_part,collimator
 ap8_units,degrees
-att_part,collimator
+att_part,instrument
 att_units,mm
 bs1_part,detector
 bs1_units,degrees
@@ -58,7 +58,7 @@ sap_part,sample
 sap_units,mm
 schi_part,sample
 schi_units,degrees
-sdh_part,collimator
+sdh_part,instrument
 sdh_units,mm
 som_part,sample
 som_units,degrees
@@ -84,5 +84,5 @@ sx_part,sample
 sx_units,mm
 sy_part,sample
 sy_units,mm
-vs_part,velocity_selector
+vs_part,instrument
 vs_units,mm
diff --git a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl
index 38e8926b..60e4de8c 100644
--- a/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/bilby/config/motors/motor_configuration.tcl
@@ -13,3 +13,10 @@ for {set n 1} {$n <= 8} {incr n} {
   make_coll_motor_1 c$n c$n col$n count
   make_coll_motor_1 a$n a$n ap$n  count
 }
+
+# Make a position-motor for the attenuator
+make_coll_motor_1 att_pos att_pos att count
+
+# make gap/offset motors for the slits
+make_gap_motors ss1hg gap ss1ho offset ss1r ss1l mm first/horizontal
+make_gap_motors ss1vg gap ss1vo offset ss1u ss1d mm first/vertical
diff --git a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
index 383e71be..388c1ad1 100644
--- a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
+++ b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
@@ -150,7 +150,7 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
 
     MakeSICSObj ${name} SCT_OBJECT
 
-    sicslist setatt ${name} klass collimator
+    sicslist setatt ${name} klass instrument
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
@@ -212,7 +212,7 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
       ${sct_controller} write ${scobj_hpath}/rough_100
       ${sct_controller} write ${scobj_hpath}/rough_40
     }
-    hsetprop ${scobj_hpath} klass collimator
+    hsetprop ${scobj_hpath} klass instrument
 # hook code starts
 # hook code ends
   } catch_message ]
diff --git a/site_ansto/instrument/bilby/config/motors/shutters.sct b/site_ansto/instrument/bilby/config/motors/shutters.sct
index d1f99bba..e0c2a55b 100644
--- a/site_ansto/instrument/bilby/config/motors/shutters.sct
+++ b/site_ansto/instrument/bilby/config/motors/shutters.sct
@@ -5,7 +5,7 @@
 driver shutters = {
   usecreatenode = false
   vendor = galil; device = mc4; protocol = dmc2280;
-  class = collimator
+  class = instrument
   simulation_group = motor_simulation
 #
 # Unnamed group has variables at device level