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

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

@@ -65,8 +65,10 @@ set sz_home 2147456656
 #
 # set new value after repoistioning of encoders after cable chain installation
 # set sx_Home 9044450
-set sx_Home 9041997
-
+#set sx_Home 9041997
+# value after dismanteling the table
+# parameter sz=419.01 - mtth=79
+set sx_Home 9050918
 
 
 #set sy_Home 7230717
@@ -78,7 +80,11 @@ set sx_Home 9041997
 #set sy_Home 18773863
 # set new value after repoistioning of encoders after cable chain installation
 # set sy_Home 18785483
-set sy_Home 18784175
+#set sy_Home 18784175
+# value after dismanteling the table
+# parameter sz=419.01 - mtth=79
+#set sy_Home 18814870
+set sy_Home 18815280
 
 # swapped sx with sy after rotation of vertical stage
 set sx_pitch 4.9995324
@@ -88,7 +94,9 @@ set sy_pitch 5.0
 #set som_Home 25063452
 # changed from 25063452 to 25137535 on 20.11.2008
 # changed from 25137535 to 25153657 on 31.03.2009
-set som_Home 25153657
+# set som_Home 25153657
+#set som_Home 25309227
+set som_Home 26472736
 
 #set stth_Home 28686300
 #set stth_Home 29446192
@@ -110,7 +118,10 @@ set psp_home 3977689
 set psp_home 4084134
 
 #set psw_home 2040518
-set psw_home 7784698
+
+#set psw_home 7784698
+set psw_home 7789698
+
 
 #set ssho_home 500000
 #set ssho_home 7193394
@@ -314,7 +325,7 @@ Motor sz $motor_driver_type [params \
   axis A\
   units mm\
   hardlowerlim 0\
-  hardupperlim 750\
+  hardupperlim 460\
   maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
@@ -324,7 +335,8 @@ Motor sz $motor_driver_type [params \
   cntsPerX -[expr (1<<15)/260.165]]
 setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350
 sz speed 1
-sz softupperlim 600
+sz softupperlim 460
+sz softlowerlim 0
 sz part sample
 sz backlash_offset -1
 sz blockage_ratio 5
@@ -459,7 +471,7 @@ Motor som $motor_driver_type [params \
   axis E\
   units degrees\
   hardlowerlim -180\
-  hardupperlim 180\
+  hardupperlim 185\
   maxSpeed 3\
   maxAccel 5\
   maxDecel 5\

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

@@ -1,5 +1,4 @@
-#set ssw_home 2043085
-set ssw_home 8215625
+set ssw_home 8220625
 
 # Secondary Slit, width
 Motor ssw $motor_driver_type [params \