diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl index a8b320e1..dee3042b 100644 --- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.6 $ -# $Date: 2007-06-12 23:51:49 $ +# $Revision: 1.7 $ +# $Date: 2007-07-04 23:42:46 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -35,8 +35,8 @@ MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port) # 7830128, 7493025, 7431942, 7891548, 28473828, 11307802, 0, 0 set mphi_Home 7830128 set mchi_Home 7493025 -set my_Home 7431942 -set mx_Home 7891548 +set mx_Home 7431942 +set my_Home 7891548 set mom_Home 28473827 set mtth_Home 11307852 set sy_Home 7500000 @@ -97,30 +97,9 @@ mchi part crystal mchi long_name chi # Monochromator Trans 1, upper -Motor my $motor_driver_type [params \ - asyncqueue mc1\ - axis C\ - units mm\ - hardlowerlim -10\ - hardupperlim 10\ - maxSpeed 1\ - maxAccel 1\ - maxDecel 1\ - stepsPerX 25000\ - absEnc 1\ - absEncHome $my_Home\ - cntsPerX 8192] -setHomeandRange -motor my -home 0 -lowrange 10 -uprange 10 -my speed 1 -my movecount $move_count -my precision 0.01 -my part crystal -my long_name translate_y - -# Monochromator Trans 2, lower Motor mx $motor_driver_type [params \ asyncqueue mc1\ - axis D\ + axis C\ units mm\ hardlowerlim -10\ hardupperlim 10\ @@ -136,7 +115,28 @@ mx speed 1 mx movecount $move_count mx precision 0.01 mx part crystal -mx long_name translate_x +mx long_name translate_y + +# Monochromator Trans 2, lower +Motor my $motor_driver_type [params \ + asyncqueue mc1\ + axis D\ + units mm\ + hardlowerlim -10\ + hardupperlim 10\ + maxSpeed 1\ + maxAccel 1\ + maxDecel 1\ + stepsPerX -25000\ + absEnc 1\ + absEncHome $my_Home\ + cntsPerX -8192] +setHomeandRange -motor my -home 0 -lowrange 10 -uprange 10 +my speed 1 +my movecount $move_count +my precision 0.01 +my part crystal +my long_name translate_x # Monochromator omega, rotate Motor mom $motor_driver_type [params \