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/reflectometer/config/motors/motor_configuration.tcl

@@ -307,8 +307,8 @@ Motor st3vt $motor_driver_type [params \
   absEnc 1\
   absEncHome $st3vt_home\
   cntsPerX -8192]
-st3vt part aperture.$slit3VGroup
-st3vt long_name st3vt
+st3vt part aperture
+st3vt long_name ${slit3VGroup}_st3vt
 st3vt softlowerlim 0
 st3vt softupperlim 253
 st3vt home 0
@@ -331,8 +331,8 @@ Motor st4vt $motor_driver_type [params \
   absEnc 1\
   absEncHome $st4vt_home\
   cntsPerX -8192]
-st4vt part aperture.$slit4VGroup
-st4vt long_name st4vt
+st4vt part aperture
+st4vt long_name ${slit4VGroup}_st4vt
 st4vt softlowerlim 0
 st4vt softupperlim 249
 st4vt home 0
@@ -530,8 +530,8 @@ Motor ss1l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss1l_Home]
-ss1l part aperture.$slit1HGroup
-ss1l long_name left
+ss1l part aperture
+ss1l long_name ${slit1HGroup}_left
 ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
@@ -550,8 +550,8 @@ Motor ss1r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss1r_Home]
-ss1r part aperture.$slit1HGroup
-ss1r long_name right
+ss1r part aperture
+ss1r long_name ${slit1HGroup}_right
 ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
@@ -570,8 +570,8 @@ Motor ss1u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss1u_Home]
-ss1u part aperture.$slit1VGroup
-ss1u long_name upper
+ss1u part aperture
+ss1u long_name ${slit1VGroup}_upper
 ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
@@ -590,8 +590,8 @@ Motor ss1d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss1d_Home]
-ss1d part aperture.$slit1VGroup
-ss1d long_name lower
+ss1d part aperture
+ss1d long_name ${slit1VGroup}_lower
 ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
@@ -610,8 +610,8 @@ Motor ss2l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss2l_Home]
-ss2l part aperture.$slit2HGroup
-ss2l long_name left
+ss2l part aperture
+ss2l long_name ${slit2HGroup}_left
 ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
@@ -630,8 +630,8 @@ Motor ss2r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss2r_Home]
-ss2r part aperture.$slit2HGroup
-ss2r long_name right
+ss2r part aperture
+ss2r long_name ${slit2HGroup}_right
 ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
@@ -650,8 +650,8 @@ Motor ss2u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss2u_Home]
-ss2u part aperture.$slit2VGroup
-ss2u long_name upper
+ss2u part aperture
+ss2u long_name ${slit2VGroup}_upper
 ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
@@ -670,8 +670,8 @@ Motor ss2d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss2d_Home]
-ss2d part aperture.$slit2VGroup
-ss2d long_name lower
+ss2d part aperture
+ss2d long_name ${slit2VGroup}_lower
 ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
@@ -697,8 +697,8 @@ Motor ss3d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss3d_Home]
-ss3d part aperture.$slit3VGroup
-ss3d long_name lower
+ss3d part aperture
+ss3d long_name ${slit3VGroup}_lower
 ss3d softlowerlim $ss3d_LoRange
 ss3d softupperlim $ss3d_HiRange
 ss3d home 0
@@ -717,8 +717,8 @@ Motor ss3u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss3u_Home]
-ss3u part aperture.$slit3VGroup
-ss3u long_name upper
+ss3u part aperture
+ss3u long_name ${slit3VGroup}_upper
 ss3u softlowerlim $ss3u_LoRange
 ss3u softupperlim $ss3u_HiRange
 ss3u home 0
@@ -737,8 +737,8 @@ Motor ss3l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss3l_Home]
-ss3l part aperture.$slit3HGroup
-ss3l long_name left
+ss3l part aperture
+ss3l long_name ${slit3HGroup}_left
 ss3l softlowerlim $ss3l_LoRange
 ss3l softupperlim $ss3l_HiRange
 ss3l home 0
@@ -757,8 +757,8 @@ Motor ss3r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss3r_Home]
-ss3r part aperture.$slit3HGroup
-ss3r long_name right
+ss3r part aperture
+ss3r long_name ${slit3HGroup}_right
 ss3r softlowerlim $ss3r_LoRange
 ss3r softupperlim $ss3r_HiRange
 ss3r home 0
@@ -777,8 +777,8 @@ Motor ss4d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss4d_Home]
-ss4d part aperture.$slit4VGroup
-ss4d long_name lower
+ss4d part aperture
+ss4d long_name ${slit4VGroup}_lower
 ss4d softlowerlim $ss4d_LoRange
 ss4d softupperlim $ss4d_HiRange
 ss4d home 0
@@ -797,8 +797,8 @@ Motor ss4u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss4u_Home]
-ss4u part aperture.$slit4VGroup
-ss4u long_name upper
+ss4u part aperture
+ss4u long_name ${slit4VGroup}_upper
 ss4u softlowerlim $ss4u_LoRange
 ss4u softupperlim $ss4u_HiRange
 ss4u home 0
@@ -817,8 +817,8 @@ Motor ss4l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss4l_Home]
-ss4l part aperture.$slit4HGroup
-ss4l long_name left
+ss4l part aperture
+ss4l long_name ${slit4HGroup}_left
 ss4l softlowerlim $ss4l_LoRange
 ss4l softupperlim $ss4l_HiRange
 ss4l home 0
@@ -837,8 +837,8 @@ Motor ss4r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss4r_Home]
-ss4r part aperture.$slit4HGroup
-ss4r long_name right
+ss4r part aperture
+ss4r long_name ${slit4HGroup}_right
 ss4r softlowerlim $ss4r_LoRange
 ss4r softupperlim $ss4r_HiRange
 ss4r home 0