Merged changes made in-situ

r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines

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

@@ -37,8 +37,9 @@ set bz_home 8142000
 set c1ht_home 8265000
 set m1ro_home 134658
 set bat_home 8308518
-set st3vt_home 8742250
-set st4vt_home 8806900
+set st3vt_home 5250496
+#set st3vt_home 8742250 - victim of the encoder rearrangement
+set st4vt_home 5806721 
 set sth_home 23541737
 #set sphi_home 7548440 - victim of the NaN
 set sphi_home 7450470
@@ -46,7 +47,7 @@ set sx_home 8574000
 set sy_home 7500000
 set sz_home 8927484
 set dy_home 8838649
-set dz_home 7805000
+set dz_home 7788617 
 
 #Measured or computed step rate for sz (Sample Raise)
 # Motor:25000/turn, gear:1/25, screw:5mm/turn
@@ -331,7 +332,7 @@ Motor st3vt $motor_driver_type [params \
   stepsPerX 25000\
   absEnc 1\
   absEncHome $st3vt_home\
-  cntsPerX -8192]
+  cntsPerX 8192]
 st3vt part slits.$slit3VGroup
 st3vt long_name st3vt
 st3vt softlowerlim 0
@@ -355,7 +356,7 @@ Motor st4vt $motor_driver_type [params \
   stepsPerX 25000\
   absEnc 1\
   absEncHome $st4vt_home\
-  cntsPerX -8192]
+  cntsPerX 8192]
 st4vt part slits.$slit4VGroup
 st4vt long_name st4vt
 st4vt softlowerlim 0
@@ -527,7 +528,7 @@ Motor dz $motor_driver_type [params \
   cntsPerX [expr -8192.0/5.0]]
 dz part detector
 dz long_name vertical_translation
-dz softlowerlim 0
+dz softlowerlim 1
 dz softupperlim 1351
 dz home 0
 dz speed 2