diff --git a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl index 40bc1e95..8143745d 100644 --- a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.13 $ -# $Date: 2007-10-29 02:59:58 $ +# $Revision: 1.14 $ +# $Date: 2007-12-06 23:19:01 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -53,8 +53,8 @@ set apx_Home 7500000 set apz_Home 7500000 set att_Home 7500000 -set bsx_Home 22358693 -set bsz_Home 7882500 +set bsx_Home 7831707 +set bsz_Home 10143000 set bs5_Home 7500000 set bs4_Home 7500000 set bs3_Home 7500000 @@ -349,6 +349,7 @@ det home 0 det speed 20 # Detector translation across beam [-50,450] mm +# Looks like an non-metric screw pitch 0.2 inches / turn Motor detoff $motor_driver_type [params \ asyncqueue mc1\ host mc1-quokka\ @@ -360,10 +361,10 @@ Motor detoff $motor_driver_type [params \ maxSpeed 10\ maxAccel 1\ maxDecel 10\ - stepsPerX [expr -(25000.0*3.0)/5.0]\ + stepsPerX [expr -(25000.0*3.0)/5.08]\ absEnc 1\ absEncHome $detoff_Home\ - cntsPerX [expr 8192.0/5.0]] + cntsPerX [expr 8192.0/5.08]] detoff part detector detoff long_name detector_x detoff softlowerlim -50 @@ -779,19 +780,19 @@ Motor bsx $motor_driver_type [params \ port pmc4-quokka\ axis A\ units mm\ - hardlowerlim -100\ - hardupperlim 300\ + hardlowerlim -200\ + hardupperlim 200\ maxSpeed 1\ maxAccel 1\ maxDecel 5\ - stepsPerX 25000\ + stepsPerX [expr -(25000.0*7.0)/5.0/1.02]\ absEnc 1\ absEncHome $bsx_Home\ - cntsPerX 8192] + cntsPerX [expr 8192.0/5.0/1.02]] bsx part detector bsx long_name bsx -bsx softlowerlim -100 -bsx softupperlim 300 +bsx softlowerlim -200 +bsx softupperlim 200 bsx home 0 # beam stop vertical [-240,100] mm @@ -806,10 +807,10 @@ Motor bsz $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 5\ - stepsPerX 25000\ + stepsPerX [expr (25000.0*7.0)/5.0/1.02]\ absEnc 1\ absEncHome $bsz_Home\ - cntsPerX 8192] + cntsPerX [expr (8192.0*7.0)/5.0/1.02]] bsz part detector bsz long_name bsz bsz softlowerlim -240 @@ -828,7 +829,7 @@ Motor bs5 $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 5\ - stepsPerX 25000\ + stepsPerX -25000\ motorHome $bs5_Home] bs5 part detector bs5 long_name bs5 @@ -848,7 +849,7 @@ Motor bs4 $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 5\ - stepsPerX 25000\ + stepsPerX -25000\ motorHome $bs4_Home] bs4 part detector bs4 long_name bs4 @@ -888,7 +889,7 @@ Motor bs2 $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 5\ - stepsPerX 25000\ + stepsPerX -25000\ motorHome $bs2_Home] bs2 part detector bs2 long_name bs2