diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl index c734a71f..1b40b726 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.15 $ -# $Date: 2007-11-07 22:46:46 $ +# $Revision: 1.16 $ +# $Date: 2007-11-08 22:47:47 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -39,8 +39,10 @@ set mx_Home 7431942 set my_Home 7891548 set mom_Home 28473827 set mtth_Home 11706130 -set sy_Home 8405693 -set sx_Home 7230717 +#set sz_home 2147458067 +set sz_home 2147457556 +set sx_Home 8405693 +set sy_Home 7230717 set som_Home 23164850 set stth_Home 7500000 set mf1_Home 7500000 @@ -170,13 +172,13 @@ Motor mtth $motor_driver_type [params \ maxSpeed 0.2\ maxAccel 0.2\ maxDecel 0.2\ - stepsPerX [expr 25000*10]\ + stepsPerX [expr 25000]\ airpads 1\ settle 5\ motoffdelay 5000\ absEnc 1\ absEncHome $mtth_Home\ - cntsPerX -93207] + cntsPerX 93207] mtth softlowerlim 45 mtth softupperlim 100 mtth home 90 @@ -211,10 +213,10 @@ Motor sz1 $motor_driver_type [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX [expr 25000.0/0.11/2.0]\ + stepsPerX [expr -25000.0*(24.0/25.0)*50/11.0/2.0]\ absenc 1\ - absenchome 2147458067\ - cntsPerX 113] + absenchome $sz_home\ + cntsPerX -125.8] setHomeandRange -motor sz1 -home 0 -lowrange 0 -uprange 350 sz1 speed 1 sz1 precision 0.01 @@ -238,47 +240,47 @@ sz2 precision 0.01 sz2 part sample.second sz2 long_name vertical_translation -# Sample Trans 1, upper, y -Motor sy $motor_driver_type [params \ +# Sample Trans 1, upper, x +Motor sx $motor_driver_type [params \ asyncqueue mc2\ axis C\ units mm\ hardlowerlim -250\ hardupperlim 250\ - maxSpeed 1\ + maxSpeed 10\ maxAccel 1\ maxDecel 1\ - stepsPerX [expr 25000.0/5.0]\ + stepsPerX [expr -2.0*25000.0/5.0]\ absEnc 1\ - absEncHome $sy_Home\ - cntsPerX [expr -8192.0/5.0]] -setHomeandRange -motor sy -home 0 -lowrange 250 -uprange 250 -sy speed 1 -sy movecount $move_count -sy precision 0.01 -sy part sample -sy long_name translate_y + absEncHome $sx_Home\ + cntsPerX [expr 8192.0/5.0]] +setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250 +sx speed 5 +sx movecount $move_count +sx precision 0.01 +sx part sample +sx long_name translate_x -# Sample Trans2, lower, x -Motor sx $motor_driver_type [params \ +# Sample Trans2, lower, y +Motor sy $motor_driver_type [params \ asyncqueue mc2\ axis D\ units mm\ hardlowerlim -250\ hardupperlim 250\ - maxSpeed 1\ + maxSpeed 10\ maxAccel 1\ maxDecel 1\ - stepsPerX [expr 25000.0/5.0]\ + stepsPerX [expr 2.0*25000.0/5.0]\ absEnc 1\ - absEncHome $sx_Home\ + absEncHome $sy_Home\ cntsPerX [expr -8192.0/5.0]] -setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250 -sx speed 1 -sx movecount $move_count -sx precision 0.01 -sx part sample -sx long_name translate_x +setHomeandRange -motor sy -home 0 -lowrange 250 -uprange 250 +sy speed 5 +sy movecount $move_count +sy precision 0.01 +sy part sample +sy long_name translate_y # Sample Omega, rotate Motor som $motor_driver_type [params \