Merge changes made in-situ.

r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines

site_ansto/instrument/rsd/config/motors/euler_configuration.tcl

@@ -4,9 +4,9 @@
 # Home value for Eulerian cradle
 #
 #
-set eom_Home 23329261
+set eom_Home 23165406
 set ephi_Home 6647676
-set echi_Home 8919319
+set echi_Home 8919336
 
 # Sample Tilt 1, euler omega stage -> exchange with ssw further down
 Motor eom $motor_driver_type [params \
@@ -22,8 +22,10 @@ Motor eom $motor_driver_type [params \
   absEnc 1\
   absEncHome $eom_Home\
   cntsPerX 8192]
-setHomeandRange -motor eom -home 0 -lowrange -390 -uprange 390
 eom speed 1
+eom softlowerlim -390
+eom softupperlim 390
+eom home 0
 eom movecount $move_count
 eom precision 0.01
 eom part sample
@@ -34,16 +36,15 @@ Motor echi $motor_driver_type [params \
   asyncqueue mc2\
   axis G\
   units degrees\
-  hardlowerlim -10\
-  hardupperlim 95\
-  maxSpeed 3\
-  maxAccel 1\
-  maxDecel 1\
-  stepsPerX -25000\
+  hardlowerlim -390\
+  hardupperlim 390\
+  maxSpeed 5\
+  maxAccel 3\
+  maxDecel 3\
+  stepsPerX [expr -25000 ]\
   absEnc 1\
   absEncHome $echi_Home\
-  cntsPerX 8192]
-setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
+  cntsPerX [expr 8192 ] ]
 echi softlowerlim -10
 echi softupperlim 90
 echi home 0