diff --git a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl index 8143745d..6669a236 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.14 $ -# $Date: 2007-12-06 23:19:01 $ +# $Revision: 1.15 $ +# $Date: 2008-02-19 04:27:19 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -51,15 +51,15 @@ set pent_Home 8123563 set srce_Home 7518652 set apx_Home 7500000 set apz_Home 7500000 -set att_Home 7500000 +set att_Home 24782942 set bsx_Home 7831707 set bsz_Home 10143000 -set bs5_Home 7500000 -set bs4_Home 7500000 -set bs3_Home 7500000 -set bs2_Home 7500000 -set bs1_Home 7500000 +set bs5_Home 0 +set bs4_Home 0 +set bs3_Home 0 +set bs2_Home 0 +set bs1_Home 0 set pol_Home 7500000 # early Guide mesaurements @@ -746,25 +746,26 @@ setHomeandRange -motor apz -home 0 -lowrange 0 -uprange 5 apz speed 1 # Rotary attenuator +set att_factor [expr ((1.0 - (1.0)/360.0)*(3000.0/61.0))/360.0] Motor att $motor_driver_type [params \ asyncqueue mc3\ host mc3-quokka\ port pmc3-quokka\ axis G\ - units mm\ - hardlowerlim 0\ - hardupperlim 5\ - maxSpeed 1\ + units degrees\ + hardlowerlim -30\ + hardupperlim 7230\ + maxSpeed 10\ maxAccel 1\ maxDecel 1\ - stepsPerX [expr 25000.0/360.0]\ + stepsPerX [expr ($att_factor*25000.0)]\ absEnc 1\ absEncHome $att_Home\ - cntsPerX [expr 8192.0/360.0]] + cntsPerX [expr -($att_factor*8192.0)]] att part collimator att long_name att -setHomeandRange -motor att -home 0 -lowrange -30 -uprange 390 -att speed 1 +setHomeandRange -motor att -home 0 -lowrange -30 -uprange 7230 +att speed 5 ############################ # Motor Controller 4