Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines

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

@@ -4,33 +4,91 @@
 # Home value for Eulerian cradle
 #
 #
+# this is the Huber Eulerian cradle
+#
 set eom_Home 23165406
 set ephi_Home 6647676
 set echi_Home 8919336
 
+set eom_stepsPerX [expr -25000.0]
+set eom_cntsPerX  [expr   8192.0] 
+
+set ephi_stepsPerX [expr -25000.0/2.0]
+set ephi_cntsPerX  [expr  -8192.0/2.0] 
+
+set echi_stepsPerX [expr  -25000.0/1.0]
+set echi_cntsPerX  [expr  8192.0/1.0] 
+
+
+#
+# this is our own tiny black cradle
+#
+#set eom_Home 23165406
+#set ephi_Home 20947518
+#set echi_Home 24735790
+#
+#set eom_stepsPerX [expr -25000.0]
+#set eom_cntsPerX  [expr   8192.0] 
+#
+#set ephi_stepsPerX [expr -25000.0]
+#set ephi_cntsPerX  [expr   8192.0]
+#
+#set echi_stepsPerX [expr -25000.0]
+#set echi_cntsPerX  [expr   8192.0] 
+
+
 # Sample Tilt 1, euler omega stage -> exchange with ssw further down
+#Motor eom $motor_driver_type [params \
+#  asyncqueue mc4\
+#  axis F\
+#  units degrees\
+#  hardlowerlim -390\
+#  hardupperlim 390\
+#  maxSpeed 1\
+#  maxAccel 1\
+#  maxDecel 1\
+#  stepsPerX $eom_stepsPerX\
+#  absEnc 1\
+#  absEncHome $eom_Home\
+#  cntsPerX $eom_cntsPer]
+#setHomeandRange -motor eom -home 0 -lowrange -390 -uprange 390
+#eom speed 1
+#eom softlowerlim -390
+#eom softupperlim 390
+#eom movecount $move_count
+#eom precision 0.01
+#eom part sample
+#eom long_name eom
+
+
+#
+# use sample omega until euler omega gets its own cables
+#
+#
+# Sample Omega, rotate
 Motor eom $motor_driver_type [params \
-  asyncqueue mc4\
-  axis F\
+  asyncqueue mc2\
+  axis E\
   units degrees\
-  hardlowerlim -390\
-  hardupperlim 390\
-  maxSpeed 1\
-  maxAccel 1\
-  maxDecel 1\
-  stepsPerX -25000\
+  hardlowerlim -180\
+  hardupperlim 180\
+  maxSpeed 3\
+  maxAccel 5\
+  maxDecel 5\
+  stepsPerX [expr -25000.0*(383.0/360.0)]\
   absEnc 1\
-  absEncHome $eom_Home\
-  cntsPerX 8192]
-eom speed 1
-eom softlowerlim -390
-eom softupperlim 390
-eom home 0
-eom movecount $move_count
+  absEncHome 26472736\
+  cntsPerX [expr 8192.0*(383.0/360.0)]]
+setHomeandRange -motor som -home 0 -lowrange 178 -uprange 178
+eom Backlash_offset -0.5
+eom speed 2
+eom accel 0.1
+eom decel 0.1
 eom precision 0.01
 eom part sample
 eom long_name eom
 
+
 # Sample Tilt 2, euler chi stage -> EC1
 Motor echi $motor_driver_type [params \
   asyncqueue mc2\
@@ -38,13 +96,14 @@ Motor echi $motor_driver_type [params \
   units degrees\
   hardlowerlim -390\
   hardupperlim 390\
-  maxSpeed 5\
+  maxSpeed 10\
   maxAccel 3\
   maxDecel 3\
-  stepsPerX [expr -25000 ]\
+  stepsPerX $echi_stepsPerX\
   absEnc 1\
   absEncHome $echi_Home\
-  cntsPerX [expr 8192 ] ]
+  cntsPerX $echi_cntsPerX ]
+setHomeandRange -motor echi -home 0 -lowrange -390 -uprange 390
 echi softlowerlim -10
 echi softupperlim 90
 echi home 0
@@ -61,13 +120,13 @@ Motor ephi $motor_driver_type [params \
   units degrees\
   hardlowerlim -400\
   hardupperlim 400\
-  maxSpeed 3\
+  maxSpeed 10\
   maxAccel 1\
   maxDecel 1\
-  stepsPerX [expr -25000.0/2.0]\
+  stepsPerX $ephi_stepsPerX\
   absEnc 1\
   absEncHome $ephi_Home\
-  cntsPerX [expr -8192.0/2.0]]
+  cntsPerX $ephi_cntsPerX]
 setHomeandRange -motor ephi -home 0 -lowrange 400 -uprange 400
 ephi softlowerlim -400
 ephi softupperlim 400

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

@@ -68,7 +68,7 @@ set sz_home 2147456656
 #set sx_Home 9041997
 # value after dismanteling the table
 # parameter sz=419.01 - mtth=79
-set sx_Home 9050918
+set sx_Home 9050281
 
 
 #set sy_Home 7230717
@@ -84,7 +84,7 @@ set sx_Home 9050918
 # value after dismanteling the table
 # parameter sz=419.01 - mtth=79
 #set sy_Home 18814870
-set sy_Home 18815280
+set sy_Home 18815689
 
 # swapped sx with sy after rotation of vertical stage
 set sx_pitch 4.9995324
@@ -116,19 +116,20 @@ set psho_home 7576691
 set psp_home 3977689
 # set home value to be equal to front limit switch 28.01.2009, corr. to 50 mm distance to the stits front edge
 set psp_home 4084134
+set psp_home 4813236
 
 #set psw_home 2040518
-
 #set psw_home 7784698
-set psw_home 7789698
-
+#set psw_home 7789698
+set psw_home 7785599
 
 #set ssho_home 500000
 #set ssho_home 7193394
 set ssho_home 6877100
 #set ssp_home 2043085
 #set ssp_home 8701689
-set ssp_home 8701400
+#set ssp_home 8701400
+set ssp_home 9192956
 
 set move_count 10
 
@@ -325,7 +326,7 @@ Motor sz $motor_driver_type [params \
   axis A\
   units mm\
   hardlowerlim 0\
-  hardupperlim 460\
+  hardupperlim 500\
   maxSpeed 2\
   maxAccel 1\
   maxDecel 1\
@@ -334,8 +335,8 @@ Motor sz $motor_driver_type [params \
   absenchome $sz_home\
   cntsPerX -[expr (1<<15)/260.165]]
 setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350
-sz speed 1
-sz softupperlim 460
+sz speed 0.6
+sz softupperlim 500
 sz softlowerlim 0
 sz part sample
 sz backlash_offset -1
@@ -471,7 +472,7 @@ Motor som $motor_driver_type [params \
   axis E\
   units degrees\
   hardlowerlim -180\
-  hardupperlim 185\
+  hardupperlim 180\
   maxSpeed 3\
   maxAccel 5\
   maxDecel 5\
@@ -479,7 +480,7 @@ Motor som $motor_driver_type [params \
   absEnc 1\
   absEncHome $som_Home\
   cntsPerX [expr -8192.0*(383.0/360.0)]]
-setHomeandRange -motor som -home 0 -lowrange 180 -uprange 180
+setHomeandRange -motor som -home 0 -lowrange 178 -uprange 178
 som Backlash_offset -0.5
 som speed 2
 som accel 0.1
@@ -493,7 +494,7 @@ Motor stth $motor_driver_type [params \
   asyncqueue mc2\
   axis F\
   units degrees\
-  hardlowerlim 40\
+  hardlowerlim 30\
   hardupperlim 119.6\
   maxSpeed 0.5\
   maxAccel 0.1\
@@ -502,7 +503,7 @@ Motor stth $motor_driver_type [params \
   absEnc 1\
   absEncHome $stth_Home\
   cntsPerX [expr -8192.0/$stth_pitch]]
-stth softlowerlim 40
+stth softlowerlim 30
 stth softupperlim 119.6
 stth home 0
 stth speed 0.2
@@ -607,7 +608,7 @@ Motor psp $motor_driver_type [params \
   axis B\
   units mm\
   hardlowerlim 0\
-  hardupperlim 150\
+  hardupperlim 280\
   maxSpeed 4\
   maxAccel 1\
   maxDecel 1\
@@ -619,7 +620,7 @@ psp speed 4
 psp Backlash_offset -0.3
 psp part slits
 psp long_name primary_psp
-setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
+setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 280
 
 # Primary Slit, width, 0-30mm
 Motor psw $motor_driver_type [params \
@@ -670,7 +671,7 @@ Motor ssp $motor_driver_type [params \
   axis E\
   units mm\
   hardlowerlim 0\
-  hardupperlim 150\
+  hardupperlim 220\
   maxSpeed 4\
   maxAccel 1\
   maxDecel 1\
@@ -682,7 +683,7 @@ ssp speed 4
 ssp Backlash_offset -0.3  
 ssp part slits
 ssp long_name secondary_ssp
-setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150
+setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 220
 
 # Primary Slit, height, 0-30mm
 #Motor psh $motor_driver_type [params \

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

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