diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl index 1b40b726..0e94f9ba 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.16 $ -# $Date: 2007-11-08 22:47:47 $ +# $Revision: 1.17 $ +# $Date: 2007-11-08 23:38:23 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: dcl $ @@ -178,7 +178,7 @@ Motor mtth $motor_driver_type [params \ motoffdelay 5000\ absEnc 1\ absEncHome $mtth_Home\ - cntsPerX 93207] + cntsPerX [expr (1<<25)/360.0]] mtth softlowerlim 45 mtth softupperlim 100 mtth home 90 @@ -204,7 +204,7 @@ mtth long_name takeoff_angle # # Sample Trans, vertical, first stage -Motor sz1 $motor_driver_type [params \ +Motor sz $motor_driver_type [params \ asyncqueue mc2\ axis A\ units mm\ @@ -216,29 +216,29 @@ Motor sz1 $motor_driver_type [params \ stepsPerX [expr -25000.0*(24.0/25.0)*50/11.0/2.0]\ absenc 1\ absenchome $sz_home\ - cntsPerX -125.8] -setHomeandRange -motor sz1 -home 0 -lowrange 0 -uprange 350 -sz1 speed 1 -sz1 precision 0.01 -sz1 part sample.first -sz1 long_name vertical_translation + cntsPerX -[expr (1<<15)/260.09]] +setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 350 +sz speed 1 +sz precision 0.01 +sz part sample.first +sz long_name vertical_translation # Sample Trans, vertical, second stage -Motor sz2 $motor_driver_type [params \ - asyncqueue mc2\ - axis B\ - units mm\ - hardlowerlim 0\ - hardupperlim 350\ - maxSpeed 1\ - maxAccel 1\ - maxDecel 1\ - stepsPerX 25000] -setHomeandRange -motor sz2 -home 0 -lowrange 0 -uprange 350 -sz2 speed 1 -sz2 precision 0.01 -sz2 part sample.second -sz2 long_name vertical_translation +#Motor sz2 $motor_driver_type [params \ +#asyncqueue mc2\ +#axis B\ +#units mm\ +#hardlowerlim 0\ +#hardupperlim 350\ +#maxSpeed 1\ +#maxAccel 1\ +#maxDecel 1\ +#stepsPerX 25000] +#setHomeandRange -motor sz2 -home 0 -lowrange 0 -uprange 350 +#sz2 speed 1 +#sz2 precision 0.01 +#sz2 part sample.second +#sz2 long_name vertical_translation # Sample Trans 1, upper, x Motor sx $motor_driver_type [params \