source_common.tcl

SICS-280 Check RCMS data-type and return -1 if it's invalid

motor_configuration.tcl files
Make sure that long_name matches data name for slit motors in data file.

hmm_configuration_common_1.tcl
SICS-268 Don't set VIEW_MAG_X/Y on histmem

r2699 | ffr | 2008-09-22 15:58:31 +1000 (Mon, 22 Sep 2008) | 9 lines

site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.29 $
-# $Date: 2008-08-07 03:17:28 $
+# $Revision: 1.30 $
+# $Date: 2008-09-22 05:58:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 source $cfPath(anticollider)/anticollider.tcl
@@ -513,8 +513,8 @@ ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
 ss1r movecount $move_count
-ss1r part aperture.first
-ss1r long_name right
+ss1r part aperture
+ss1r long_name first_right
 
 # Slit 1, left
 Motor ss1l $motor_driver_type [params \
@@ -532,8 +532,8 @@ ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
 ss1l movecount $move_count
-ss1l part aperture.first
-ss1l long_name left
+ss1l part aperture
+ss1l long_name first_left
 
 # Slit 1, up
 Motor ss1u $motor_driver_type [params \
@@ -551,8 +551,8 @@ ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
 ss1u movecount $move_count
-ss1u part aperture.first
-ss1u long_name top
+ss1u part aperture
+ss1u long_name first_top
 
 # Slit 1, down
 Motor ss1d $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
 ss1d movecount $move_count
-ss1d part aperture.first
-ss1d long_name bottom
+ss1d part aperture
+ss1d long_name first_bottom
 
 ############################
 # Motor Controller 4
@@ -624,8 +624,8 @@ ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
 ss2r movecount $move_count
-ss2r part aperture.second
-ss2r long_name right
+ss2r part aperture
+ss2r long_name second_right
 
 # Slit 2, left
 Motor ss2l $motor_driver_type [params \
@@ -643,8 +643,8 @@ ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
 ss2l movecount $move_count
-ss2l part aperture.second
-ss2l long_name left
+ss2l part aperture
+ss2l long_name second_left
 
 # Slit 2, up
 Motor ss2u $motor_driver_type [params \
@@ -662,8 +662,8 @@ ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
 ss2u movecount $move_count
-ss2u part aperture.second
-ss2u long_name top
+ss2u part aperture
+ss2u long_name second_top
 
 # Slit 2, down
 Motor ss2d $motor_driver_type [params \
@@ -681,8 +681,8 @@ ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
 ss2d movecount $move_count
-ss2d part aperture.second
-ss2d long_name bottom
+ss2d part aperture
+ss2d long_name second_bottom
 
 # Virtual and Simulated Motors
 # ----------------------------