From 867b783ab9c5312a9a88cf2a80d277deb7176ef6 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 19 Feb 2014 17:20:16 +1100
Subject: [PATCH] Rename bilby rough_20 to rough_100

---
 .../bilby/config/motors/sct_shutters.tcl      | 36 +++++++++----------
 .../bilby/config/motors/shutters.sct          |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
index 46df0f3b..383e71be 100644
--- a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
+++ b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
@@ -168,22 +168,22 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
     hsetprop ${scobj_hpath}/fast_shutter sdsinfo "::nexus::scobj::sdsinfo"
     hsetprop ${scobj_hpath}/fast_shutter type "part"
 
-    hfactory ${scobj_hpath}/rough_20 plain user text
-    hsetprop ${scobj_hpath}/rough_20 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
-    hsetprop ${scobj_hpath}/rough_20 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
-    hsetprop ${scobj_hpath}/rough_20 write ${ns}::write_switch ${scobj_hpath} noResponse {11}
-    hsetprop ${scobj_hpath}/rough_20 noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/rough_20 check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/rough_20 control true
-    hsetprop ${scobj_hpath}/rough_20 data true
-    hsetprop ${scobj_hpath}/rough_20 mutable false
-    hsetprop ${scobj_hpath}/rough_20 nxsave true
-    hsetprop ${scobj_hpath}/rough_20 values in,out
-    hsetprop ${scobj_hpath}/rough_20 oldval UNKNOWN
-    hsetprop ${scobj_hpath}/rough_20 klass "collimator"
-    hsetprop ${scobj_hpath}/rough_20 nxalias "rough_20"
-    hsetprop ${scobj_hpath}/rough_20 sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/rough_20 type "part"
+    hfactory ${scobj_hpath}/rough_100 plain user text
+    hsetprop ${scobj_hpath}/rough_100 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
+    hsetprop ${scobj_hpath}/rough_100 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
+    hsetprop ${scobj_hpath}/rough_100 write ${ns}::write_switch ${scobj_hpath} noResponse {11}
+    hsetprop ${scobj_hpath}/rough_100 noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/rough_100 check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/rough_100 control true
+    hsetprop ${scobj_hpath}/rough_100 data true
+    hsetprop ${scobj_hpath}/rough_100 mutable false
+    hsetprop ${scobj_hpath}/rough_100 nxsave true
+    hsetprop ${scobj_hpath}/rough_100 values in,out
+    hsetprop ${scobj_hpath}/rough_100 oldval UNKNOWN
+    hsetprop ${scobj_hpath}/rough_100 klass "collimator"
+    hsetprop ${scobj_hpath}/rough_100 nxalias "rough_100"
+    hsetprop ${scobj_hpath}/rough_100 sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/rough_100 type "part"
 
     hfactory ${scobj_hpath}/rough_40 plain user text
     hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]}
@@ -207,9 +207,9 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
 
     if {[SplitReply [motor_simulation]]=="false"} {
       ${sct_controller} poll ${scobj_hpath}/fast_shutter 1
-      ${sct_controller} poll ${scobj_hpath}/rough_20 1
+      ${sct_controller} poll ${scobj_hpath}/rough_100 1
       ${sct_controller} poll ${scobj_hpath}/rough_40 1
-      ${sct_controller} write ${scobj_hpath}/rough_20
+      ${sct_controller} write ${scobj_hpath}/rough_100
       ${sct_controller} write ${scobj_hpath}/rough_40
     }
     hsetprop ${scobj_hpath} klass collimator
diff --git a/site_ansto/instrument/bilby/config/motors/shutters.sct b/site_ansto/instrument/bilby/config/motors/shutters.sct
index d0051a1f..d1f99bba 100644
--- a/site_ansto/instrument/bilby/config/motors/shutters.sct
+++ b/site_ansto/instrument/bilby/config/motors/shutters.sct
@@ -37,7 +37,7 @@ driver shutters = {
       allowed = 'in,out'
       property 'nxalias' = 'rough_40'
     }
-    var rough_20 = {
+    var rough_100 = {
       readable = 1;
       read_function = read_switch_pair;
       read_command = 'MG @IN[15], @IN[16]'
@@ -45,7 +45,7 @@ driver shutters = {
       write_function = write_switch;
       write_command = '11'
       allowed = 'in,out'
-      property 'nxalias' = 'rough_20'
+      property 'nxalias' = 'rough_100'
     }
   };