From ff2657c5e375b9db46d40eb5e14774af3ff3798e Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Mon, 9 Jul 2012 09:53:00 +1000
Subject: [PATCH] Update parameters to match parameters on instrument.

r3629 | ffr | 2012-07-09 09:53:00 +1000 (Mon, 09 Jul 2012) | 2 lines
---
 .../rsd/config/motors/motor_configuration.tcl | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
index 0200fef9..03518e83 100644
--- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
@@ -51,8 +51,8 @@ set mtth_Home 11701800
 #
 set sz_home 2147456531
 #
-set sx_Home 9051767
-set sy_Home 18813082
+set sx_Home 9052833
+set sy_Home 18812526
 #
 # swapped sx with sy after rotation of vertical stage
 set sx_pitch 4.9995324
@@ -254,7 +254,7 @@ Motor mtth $motor_driver_type [params \
   asyncqueue mc1\
   axis F\
   units degrees\
-  hardlowerlim 40\
+  hardlowerlim 45\
   hardupperlim 121\
   maxSpeed 0.2\
   maxAccel 0.2\
@@ -266,7 +266,7 @@ Motor mtth $motor_driver_type [params \
   absEnc 1\
   absEncHome $mtth_Home\
   cntsPerX [expr (1<<25)/360.0]]
-mtth softlowerlim 40
+mtth softlowerlim 45
 mtth softupperlim 121
 mtth motOffDelay 20000
 mtth home 90
@@ -302,12 +302,14 @@ Motor sz $motor_driver_type [params \
   maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
-  stepsPerX [expr -25000.0*(24.0/25.0)*50/10.840/1.8*2.0]\
+  stepsPerX [expr -25000.0*(24.0/25.0)*50/10.840/1.8]\
   absenc 1\
   absenchome $sz_home\
   cntsPerX -[expr (1<<15)/260.165]]
 setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350
 sz speed 0.6
+sz accel 0.3
+sz decel 0.3
 sz softupperlim 530
 sz softlowerlim 0
 sz part sample
@@ -380,7 +382,7 @@ Motor sx $motor_driver_type [params \
   units mm\
   hardlowerlim -250\
   hardupperlim 250\
-  maxSpeed 10\
+  maxSpeed 2.5\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr 2.0*25000.0/$sx_pitch]\
@@ -388,7 +390,7 @@ Motor sx $motor_driver_type [params \
   absEncHome $sx_Home\
   cntsPerX [expr -8192.0/$sx_pitch]]
 setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250 
-sx speed 5
+sx speed 1.0
 sx accel 1.0
 sx decel 1.0
 sx movecount $move_count
@@ -420,7 +422,7 @@ Motor sy $motor_driver_type [params \
   units mm\
   hardlowerlim -250\
   hardupperlim 250\
-  maxSpeed 10\
+  maxSpeed 2.5\
   maxAccel 1\
   maxDecel 1\
   stepsPerX [expr 2.0*25000.0/$sy_pitch]\
@@ -428,7 +430,7 @@ Motor sy $motor_driver_type [params \
   absEncHome $sy_Home\
   cntsPerX [expr -8192.0/$sy_pitch]]
 setHomeandRange -motor sy -home 0 -lowrange 250 -uprange 250 
-sy speed 5
+sy speed 1.0
 sy accel 1.0
 sy decel 1.0
 sy movecount $move_count