From d275ce55094c17530e374d3fa3bdb69f5505d92f Mon Sep 17 00:00:00 2001
From: Jing Chen <jgn@ansto.gov.au>
Date: Tue, 3 May 2011 11:25:15 +1000
Subject: [PATCH] r3124 | jgn | 2011-05-03 11:25:15 +1000 (Tue, 03 May 2011) |
 1 line

---
 .../config/motors/motor_configuration.tcl      |  3 ---
 .../tas/config/motors/motor_configuration.tcl  | 18 +++++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl b/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
index 3d6eeee9..626e601b 100644
--- a/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
@@ -1,8 +1,5 @@
 # Author: Jing Chen (jgn@ansto.gov.au)
 
-# START MOTOR CONFIGURATION
-::utility::mkVar FastShutter text manager FastShutter false instrument true false
-
 # SET TO 1 TO USE THE TILT STAGE ie sample phi and chi
 set use_tiltstage 0
 
diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
index b120a92a..b8d4fd8b 100644
--- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
@@ -325,7 +325,7 @@ Motor s2 $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-s2 part detector 
+s2 part crystal 
 s2 long_name s2
 s2 softlowerlim -128
 s2 softupperlim 3
@@ -347,7 +347,7 @@ Motor ahfocus $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-ahfocus part sample
+ahfocus part crystal 
 ahfocus long_name ahfocus
 ahfocus softlowerlim -360
 ahfocus softupperlim 360
@@ -369,7 +369,7 @@ Motor avfocus $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-avfocus part sample
+avfocus part crystal
 avfocus long_name avfocus
 avfocus softlowerlim -200
 avfocus softupperlim 0
@@ -457,7 +457,7 @@ Motor atilt $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-atilt part sample
+atilt part crystal 
 atilt long_name atilt
 atilt softlowerlim -5
 atilt softupperlim 5
@@ -479,7 +479,7 @@ Motor atrans $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-atrans part sample
+atrans part crystal 
 atrans long_name atrans
 atrans softlowerlim -1
 atrans softupperlim 22
@@ -501,7 +501,7 @@ Motor a1 $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-a1 part sample
+a1 part crystal
 a1 long_name a1
 a1 softlowerlim -5.1
 a1 softupperlim 30
@@ -523,7 +523,7 @@ Motor VS_left $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-VS_left part sample
+VS_left part slits
 VS_left long_name VS_left
 VS_left softlowerlim 2
 VS_left softupperlim 35
@@ -545,7 +545,7 @@ Motor VS_right $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-VS_right part sample
+VS_right part slits 
 VS_right long_name VS_right
 VS_right softlowerlim -35
 VS_right softupperlim -2
@@ -567,7 +567,7 @@ Motor mfilter $motor_driver_type [params \
   absEnc 1\
   absEncHome $samthet_Home\
   cntsPerX 4096]
-mfilter part sample
+mfilter part crystal 
 mfilter long_name mfilter
 mfilter softlowerlim 0
 mfilter softupperlim 360