From 471234764937de2df1c2d5d594f834a6d8cdd9ed Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Sun, 1 Apr 2007 11:58:58 +1000
Subject: [PATCH] Both hipd and hrpd motors have now been configured with part
 identifiers and and long names, and the hpaths now use the long_name fields.

r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
---
 .../hipd/config/hipadaba/hpaths.tcl           | 40 +++++++-------
 .../config/motors/motor_configuration.tcl     | 52 +++++++++++++++++--
 .../hrpd/config/hipadaba/hpaths.tcl           | 44 ++++++++--------
 .../config/motors/motor_configuration.tcl     | 29 +++++++++--
 4 files changed, 116 insertions(+), 49 deletions(-)

diff --git a/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl b/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl
index 24089471..3c3da26a 100644
--- a/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl
+++ b/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl
@@ -5,26 +5,26 @@ slits/1 slits/1/horizontal slits/1/vertical slits/2 slits/2/horizontal slits/2/v
 # Maps devices (eg motors) to hipadaba paths.
 # obj name path
 set motor_hpath [list \
-ss1u top slits/1/vertical\
-ss1d bottom slits/1/vertical\
-ss1l left slits/1/horizontal\
-ss1r right slits/1/horizontal\
-ss2u top slits/2/vertical\
-ss2d bottom slits/2/vertical\
-ss2l left slits/2/horizontal\
-ss2r right slits/2/horizontal\
-som rotate sample \
-schi chi sample \
-sphi phi sample \
-sx translate_x sample \
-sy translate_y sample \
-stth detector_rotate sample \
-mchi chi monochromator \
-mom rotate monochromator \
-mphi phi monochromator \
-mtth takeoff_angle monochromator \
-mx translate_x monochromator \
-my translate_y monochromator ]
+ss1u [SplitReply [ss1u long_name]] slits/1/vertical\
+ss1d [SplitReply [ss1u long_name]] slits/1/vertical\
+ss1l [SplitReply [ss1u long_name]] slits/1/horizontal\
+ss1r [SplitReply [ss1u long_name]] slits/1/horizontal\
+ss2u [SplitReply [ss1u long_name]] slits/2/vertical\
+ss2d [SplitReply [ss1u long_name]] slits/2/vertical\
+ss2l [SplitReply [ss1u long_name]] slits/2/horizontal\
+ss2r [SplitReply [ss1u long_name]] slits/2/horizontal\
+som [SplitReply [ss1u long_name]] sample \
+schi [SplitReply [ss1u long_name]] sample \
+sphi [SplitReply [ss1u long_name]] sample \
+sx [SplitReply [ss1u long_name]] sample \
+sy [SplitReply [ss1u long_name]] sample \
+stth [SplitReply [ss1u long_name]] sample \
+mchi [SplitReply [ss1u long_name]] monochromator \
+mom [SplitReply [ss1u long_name]] monochromator \
+mphi [SplitReply [ss1u long_name]] monochromator \
+mtth [SplitReply [ss1u long_name]] monochromator \
+mx [SplitReply [ss1u long_name]] monochromator \
+my [SplitReply [ss1u long_name]] monochromator ]
 
 # Configurable virtual motors
 # obj name path master_obj
diff --git a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
index 9db057a7..fdf4f56b 100644
--- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
@@ -1,7 +1,7 @@
-# $Revision: 1.7 $
-# $Date: 2007-03-25 22:09:46 $
+# $Revision: 1.8 $
+# $Date: 2007-04-01 01:58:57 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: dcl $
+# Last revision by: $Author: ffr $
 
 # START MOTOR CONFIGURATION
 
@@ -114,6 +114,8 @@ setHomeandRange -motor mphi -home 0 -lowrange 5 -uprange 5
 mphi speed 1
 mphi movecount $move_count
 mphi precision 0.01
+mphi part crystal
+mphi long_name phi 
 
 # Monochromator chi, Tilt 2, lower
 Motor mchi DMC2280 [params \
@@ -135,6 +137,8 @@ setHomeandRange -motor mchi -home 90 -lowrange 5 -uprange 5
 mchi speed 1
 mchi movecount $move_count
 mchi precision 0.01
+mchi part crystal
+mchi long_name chi 
 
 # Monochromator Trans 1, upper
 Motor my DMC2280 [params \
@@ -156,6 +160,8 @@ setHomeandRange -motor my -home 0 -lowrange 10 -uprange 10
 my speed 1
 my movecount $move_count
 my precision 0.01
+my part crystal
+my long_name translate_y 
 
 # Monochromator Trans 2, lower
 Motor mx DMC2280 [params \
@@ -177,6 +183,8 @@ setHomeandRange -motor mx -home 0 -lowrange 10 -uprange 10
 mx speed 1
 mx movecount $move_count
 mx precision 0.01
+mx part crystal
+mx long_name translate_x 
 
 # Monochromator omega, rotate
 Motor mom DMC2280 [params \
@@ -198,6 +206,8 @@ setHomeandRange -motor mom -home 0 -lowrange 5 -uprange 95
 mom speed 1
 mom movecount $move_count
 mom precision 0.01
+mom part crystal
+mom long_name rotate 
 
 # Monochromator two-theta, flight-tube rotate
 Motor mtth DMC2280 [params \
@@ -229,6 +239,8 @@ mtth precision 0.01
 mtth maxretry 20
 mtth failafter 100
 mtth blockage_check_interval 5
+mtth part crystal
+mtth long_name takeoff_angle
 
 ############################
 # Motor Controller 2
@@ -256,6 +268,8 @@ setHomeandRange -motor sphi -home 0 -lowrange 15 -uprange 15
 sphi speed 1
 sphi movecount $move_count
 sphi precision 0.01
+sphi part sample
+sphi long_name phi 
 
 # Sample Tilt 2, lower, chi
 Motor schi DMC2280 [params \
@@ -277,6 +291,8 @@ setHomeandRange -motor schi -home 90 -lowrange 15 -uprange 15
 schi speed 1
 schi movecount $move_count
 schi precision 0.01
+schi part sample
+schi long_name chi 
 
 # Sample Trans 1, upper, y
 Motor sy DMC2280 [params \
@@ -298,6 +314,8 @@ setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20
 sy speed 1
 sy movecount $move_count
 sy precision 0.01
+sy part sample
+sy long_name translate_y 
 
 # Sample Trans2, lower, x
 Motor sx DMC2280 [params \
@@ -319,6 +337,8 @@ setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20
 sx speed 1
 sx movecount $move_count
 sx precision 0.01
+sx part sample
+sx long_name translate_x 
 
 # Sample Omega, rotate
 Motor som DMC2280 [params \
@@ -339,6 +359,8 @@ Motor som DMC2280 [params \
 setHomeandRange -motor som -home 0 -lowrange 54 -uprange 120
 som speed 1
 som precision 0.01
+som part sample
+som long_name rotate 
 
 # Sample two-theta, detector rotate
 Motor stth DMC2280 [params \
@@ -362,6 +384,8 @@ stth home 0
 stth speed 0.5
 stth movecount $move_count
 stth precision 0.01
+stth part sample
+stth long_name azimuthal_angle
 
 # Oscillating Collimator Translation
 Motor oct DMC2280 [params \
@@ -384,6 +408,8 @@ oct softupperlim 2
 oct home 0
 oct speed 0.5
 oct precision 0.01
+oct part collimator
+oct long_name oct 
 
 ############################
 # Motor Controller 3
@@ -412,6 +438,8 @@ oct precision 0.01
 #mf1 speed 1
 #mfl movecount $move_count
 #mf1 precision 0.01
+#mf1 part monochromator
+#mf1 long_name mf1 
 
 # Monochromator Focusing (Ge)
 Motor mf2 DMC2280 [params \
@@ -432,6 +460,8 @@ Motor mf2 DMC2280 [params \
 setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 1
 mf2 speed 0.1
 mf2 precision 0.01
+mf2 part monochromator
+mf2 long_name mf2 
 
 # Slit 1, right
 Motor ss1r DMC2280 [params \
@@ -449,6 +479,8 @@ Motor ss1r DMC2280 [params \
   motorHome $ss1r_Home]
 setHomeandRange -motor ss1r -home $horSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss1r movecount $move_count
+ss1r part sample
+ss1r long_name right 
 
 # Slit 1, left
 Motor ss1l DMC2280 [params \
@@ -466,6 +498,8 @@ Motor ss1l DMC2280 [params \
   motorHome $ss1l_Home]
 setHomeandRange -motor ss1l -home $horSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss1l movecount $move_count
+ss1l part sample
+ss1l long_name left 
 
 # Slit 1, up
 Motor ss1u DMC2280 [params \
@@ -483,6 +517,8 @@ Motor ss1u DMC2280 [params \
   motorHome $ss1u_Home]
 setHomeandRange -motor ss1u -home $horSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss1u movecount $move_count
+ss1u part sample
+ss1u long_name top 
 
 # Slit 1, down
 Motor ss1d DMC2280 [params \
@@ -500,6 +536,8 @@ Motor ss1d DMC2280 [params \
   motorHome $ss1d_Home]
 setHomeandRange -motor ss1d -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss1d movecount $move_count
+ss1d part sample
+ss1d long_name bottom 
 
 ############################
 # Motor Controller 4
@@ -524,6 +562,8 @@ Motor ss2r DMC2280 [params \
   motorHome $ss2r_Home]
 setHomeandRange -motor ss2r -home $vertSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss2r movecount $move_count
+ss2r part sample
+ss2r long_name right 
 
 # Slit 2, left
 Motor ss2l DMC2280 [params \
@@ -541,6 +581,8 @@ Motor ss2l DMC2280 [params \
   motorHome $ss2l_Home]
 setHomeandRange -motor ss2l -home $vertSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss2l movecount $move_count
+ss2l part sample
+ss2l long_name left 
 
 # Slit 2, up
 Motor ss2u DMC2280 [params \
@@ -558,6 +600,8 @@ Motor ss2u DMC2280 [params \
   motorHome $ss2u_Home]
 setHomeandRange -motor ss2u -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss2u movecount $move_count
+ss2u part sample
+ss2u long_name top 
 
 # Slit 2, down
 Motor ss2d DMC2280 [params \
@@ -575,6 +619,8 @@ Motor ss2d DMC2280 [params \
   motorHome $ss2d_Home]
 setHomeandRange -motor ss2d -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss2d movecount $move_count
+ss2d part sample
+ss2d long_name bottom 
 
 proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
 proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
diff --git a/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl b/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl
index ada0b61c..ef0f5a99 100644
--- a/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl
+++ b/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl
@@ -5,28 +5,28 @@ slits/1 slits/2 detector detector/monitor detector/histmem ]
 # Maps devices (eg motors) to hipadaba paths.
 # obj name path
 set motor_hpath [list \
-ss1u top  /slits/1 \
-ss1d bottom  /slits/1 \
-ss1l left  /slits/1 \
-ss1r right  /slits/1 \
-ss2u ss2u  /slits/2 \
-ss2d ss2d  /slits/2 \
-ss2l ss2l  /slits/2 \
-ss2r ss2r  /slits/2 \
-som rotate  /sample \
-schi chi  /sample \
-sphi phi  /sample \
-sx translate_x  /sample \
-sy translate_y  /sample \
-stth detector_rotate  /sample \
-pcx pcx  /monochromator \
-pcr pcr  /monochromator \
-mom mom  /monochromator \
-mchi mchi  /monochromator \
-mphi mphi  /monochromator \
-mx mx  /monochromator \
-my my  /monochromator \
-mtth mtth  /monochromator ]
+ss1u [SplitReply [ss1u long_name]]  /slits/1 \
+ss1d [SplitReply [ss1u long_name]]  /slits/1 \
+ss1l [SplitReply [ss1u long_name]]  /slits/1 \
+ss1r [SplitReply [ss1u long_name]]  /slits/1 \
+ss2u [SplitReply [ss1u long_name]]  /slits/2 \
+ss2d [SplitReply [ss1u long_name]]  /slits/2 \
+ss2l [SplitReply [ss1u long_name]]  /slits/2 \
+ss2r [SplitReply [ss1u long_name]]  /slits/2 \
+som [SplitReply [ss1u long_name]]  /sample \
+schi [SplitReply [ss1u long_name]]  /sample \
+sphi [SplitReply [ss1u long_name]]  /sample \
+sx [SplitReply [ss1u long_name]]  /sample \
+sy [SplitReply [ss1u long_name]]  /sample \
+stth [SplitReply [ss1u long_name]]  /sample \
+pcx [SplitReply [ss1u long_name]]  /monochromator \
+pcr [SplitReply [ss1u long_name]]  /monochromator \
+mom [SplitReply [ss1u long_name]]  /monochromator \
+mchi [SplitReply [ss1u long_name]]  /monochromator \
+mphi [SplitReply [ss1u long_name]]  /monochromator \
+mx [SplitReply [ss1u long_name]]  /monochromator \
+my [SplitReply [ss1u long_name]]  /monochromator \
+mtth [SplitReply [ss1u long_name]]  /monochromator ]
 
 # Configurable virtual motors
 # obj name path master_obj
diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
index f8b70b09..f0020e48 100644
--- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.9 $
-# $Date: 2007-03-31 03:34:29 $
+# $Revision: 1.10 $
+# $Date: 2007-04-01 01:58:58 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -132,6 +132,7 @@ mchi speed 1
 mchi movecount $move_count
 mchi precision 0.01
 mchi part crystal
+mchi long_name chi
 
 # Monochromator Trans 1, upper
 Motor my DMC2280 [params \
@@ -154,6 +155,7 @@ my speed 1
 my movecount $move_count
 my precision 0.01
 my part crystal
+my long_name translate_y
 
 # Monochromator Trans 2, lower
 Motor mx DMC2280 [params \
@@ -176,6 +178,7 @@ mx speed 1
 mx movecount $move_count
 mx precision 0.01
 mx part crystal
+mx long_name translate_x
 
 # Monochromator omega, rotate
 Motor mom DMC2280 [params \
@@ -198,6 +201,7 @@ mom speed 1
 mom movecount $move_count
 mom precision 0.01
 mom part crystal
+mom long_name omega
 
 # Monochromator two-theta, flight-tube rotate
 Motor mtth DMC2280 [params \
@@ -230,6 +234,7 @@ mtth maxretry 10
 mtth failafter 10
 mtth blockage_check_interval 5
 mtth part crystal
+mtth long_name takeoff_angle
 
 # Primary Collimator Translation X
 Motor pcx DMC2280 [params \
@@ -251,7 +256,8 @@ setHomeandRange -motor pcx -home 0 -lowrange 0 -uprange 148
 pcx speed 1
 pcx movecount $move_count
 pcx precision 0.01
-pcx part crystal
+pcx part collimator
+pcx long_name primary_collimator_translation
 
 # Primary Collimator Rotation
 Motor pcr DMC2280 [params \
@@ -273,7 +279,8 @@ setHomeandRange -motor pcr -home 0 -lowrange 5 -uprange 185
 pcr speed 0.1
 pcr movecount $move_count
 pcr precision 0.01
-pcr part crystal
+pcr part collimator
+pcr long_name primary_collimator_rotation
 
 ############################
 # Motor Controller 2
@@ -302,6 +309,7 @@ sphi speed 1
 sphi movecount $move_count
 sphi precision 0.01
 sphi part sample
+sphi long_name phi
 
 # Sample Tilt 2, lower, chi
 Motor schi DMC2280 [params \
@@ -324,6 +332,7 @@ schi speed 1
 schi movecount $move_count
 schi precision 0.01
 schi part sample
+schi long_name chi
 
 # Sample Trans 1, upper, y
 Motor sy DMC2280 [params \
@@ -346,6 +355,7 @@ sy speed 1
 sy movecount $move_count
 sy precision 0.01
 sy part sample
+sy long_name translate_y
 
 # Sample Trans2, lower, x
 Motor sx DMC2280 [params \
@@ -368,6 +378,7 @@ sx speed 1
 sx movecount $move_count
 sx precision 0.01
 sx part sample
+sx long_name translate_x
 
 # Sample Omega, rotate
 Motor som DMC2280 [params \
@@ -390,6 +401,7 @@ som speed 1
 som movecount $move_count
 som precision 0.01
 som part sample
+som long_name rotate
 
 # Sample two-theta, detector rotate
 Motor stth DMC2280 [params \
@@ -415,6 +427,7 @@ stth movecount $move_count
 stth precision 0.01
 stth blockage_check_interval 2
 stth part sample
+stth long_name azimuthal_angle
 
 ############################
 # Motor Controller 3
@@ -459,6 +472,7 @@ Motor ss1r DMC2280 [params \
 setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss1r movecount $move_count
 ss1r part filter
+ss1r long_name right
 
 # Slit 1, left
 Motor ss1l DMC2280 [params \
@@ -477,6 +491,7 @@ Motor ss1l DMC2280 [params \
 setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss1l movecount $move_count
 ss1l part filter
+ss1l long_name left
 
 # Slit 1, up
 Motor ss1u DMC2280 [params \
@@ -495,6 +510,7 @@ Motor ss1u DMC2280 [params \
 setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss1u movecount $move_count
 ss1u part filter
+ss1u long_name top
 
 # Slit 1, down
 Motor ss1d DMC2280 [params \
@@ -513,6 +529,7 @@ Motor ss1d DMC2280 [params \
 setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss1d movecount $move_count
 ss1d part filter
+ss1d long_name bottom
 
 ############################
 # Motor Controller 4
@@ -570,6 +587,7 @@ Motor ss2r DMC2280 [params \
 setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss2r movecount $move_count
 ss2r part filter
+ss2r long_name right
 
 # Slit 2, left
 Motor ss2l DMC2280 [params \
@@ -588,6 +606,7 @@ Motor ss2l DMC2280 [params \
 setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
 ss2l movecount $move_count
 ss2l part filter
+ss2l long_name left
 
 # Slit 2, up
 Motor ss2u DMC2280 [params \
@@ -606,6 +625,7 @@ Motor ss2u DMC2280 [params \
 setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss2u movecount $move_count
 ss2u part filter
+ss2u long_name top
 
 # Slit 2, down
 Motor ss2d DMC2280 [params \
@@ -624,6 +644,7 @@ Motor ss2d DMC2280 [params \
 setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 ss2d movecount $move_count
 ss2d part filter
+ss2d long_name bottom
 
 proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
 proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}