diff --git a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl index 2ca713c0..f8b70b09 100644 --- a/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl @@ -1,7 +1,7 @@ -# $Revision: 1.8 $ -# $Date: 2007-03-25 22:09:46 $ +# $Revision: 1.9 $ +# $Date: 2007-03-31 03:34:29 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) -# Last revision by: $Author: dcl $ +# Last revision by: $Author: ffr $ # START MOTOR CONFIGURATION @@ -109,6 +109,7 @@ setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15 mphi speed 1 mphi movecount $move_count mphi precision 0.05 +mphi part crystal # Monochromator chi, Tilt 2, lower Motor mchi DMC2280 [params \ @@ -130,6 +131,7 @@ setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15 mchi speed 1 mchi movecount $move_count mchi precision 0.01 +mchi part crystal # Monochromator Trans 1, upper Motor my DMC2280 [params \ @@ -151,6 +153,7 @@ setHomeandRange -motor my -home 0 -lowrange 20 -uprange 20 my speed 1 my movecount $move_count my precision 0.01 +my part crystal # Monochromator Trans 2, lower Motor mx DMC2280 [params \ @@ -172,6 +175,7 @@ setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20 mx speed 1 mx movecount $move_count mx precision 0.01 +mx part crystal # Monochromator omega, rotate Motor mom DMC2280 [params \ @@ -193,6 +197,7 @@ setHomeandRange -motor mom -home 0 -lowrange 10 -uprange 150 mom speed 1 mom movecount $move_count mom precision 0.01 +mom part crystal # Monochromator two-theta, flight-tube rotate Motor mtth DMC2280 [params \ @@ -224,6 +229,8 @@ mtth precision 0.02 mtth maxretry 10 mtth failafter 10 mtth blockage_check_interval 5 +mtth part crystal + # Primary Collimator Translation X Motor pcx DMC2280 [params \ multichan mc1\ @@ -244,6 +251,7 @@ setHomeandRange -motor pcx -home 0 -lowrange 0 -uprange 148 pcx speed 1 pcx movecount $move_count pcx precision 0.01 +pcx part crystal # Primary Collimator Rotation Motor pcr DMC2280 [params \ @@ -265,6 +273,7 @@ setHomeandRange -motor pcr -home 0 -lowrange 5 -uprange 185 pcr speed 0.1 pcr movecount $move_count pcr precision 0.01 +pcr part crystal ############################ # Motor Controller 2 @@ -292,6 +301,7 @@ setHomeandRange -motor sphi -home 0 -lowrange 20 -uprange 20 sphi speed 1 sphi movecount $move_count sphi precision 0.01 +sphi part sample # Sample Tilt 2, lower, chi Motor schi DMC2280 [params \ @@ -313,6 +323,7 @@ setHomeandRange -motor schi -home 90 -lowrange 20 -uprange 20 schi speed 1 schi movecount $move_count schi precision 0.01 +schi part sample # Sample Trans 1, upper, y Motor sy DMC2280 [params \ @@ -334,6 +345,7 @@ setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20 sy speed 1 sy movecount $move_count sy precision 0.01 +sy part sample # Sample Trans2, lower, x Motor sx DMC2280 [params \ @@ -355,6 +367,7 @@ setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20 sx speed 1 sx movecount $move_count sx precision 0.01 +sx part sample # Sample Omega, rotate Motor som DMC2280 [params \ @@ -376,6 +389,7 @@ setHomeandRange -motor som -home 0 -lowrange 142 -uprange 218 som speed 1 som movecount $move_count som precision 0.01 +som part sample # Sample two-theta, detector rotate Motor stth DMC2280 [params \ @@ -400,6 +414,7 @@ stth speed 0.5 stth movecount $move_count stth precision 0.01 stth blockage_check_interval 2 +stth part sample ############################ # Motor Controller 3 @@ -443,6 +458,7 @@ Motor ss1r DMC2280 [params \ motorHome $ss1r_Home] setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange ss1r movecount $move_count +ss1r part filter # Slit 1, left Motor ss1l DMC2280 [params \ @@ -460,6 +476,7 @@ Motor ss1l DMC2280 [params \ motorHome $ss1l_Home] setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange ss1l movecount $move_count +ss1l part filter # Slit 1, up Motor ss1u DMC2280 [params \ @@ -477,6 +494,7 @@ Motor ss1u DMC2280 [params \ motorHome $ss1u_Home] setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange ss1u movecount $move_count +ss1u part filter # Slit 1, down Motor ss1d DMC2280 [params \ @@ -494,6 +512,7 @@ Motor ss1d DMC2280 [params \ motorHome $ss1d_Home] setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange ss1d movecount $move_count +ss1d part filter ############################ # Motor Controller 4 @@ -550,6 +569,7 @@ Motor ss2r DMC2280 [params \ motorHome $ss2r_Home] setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange ss2r movecount $move_count +ss2r part filter # Slit 2, left Motor ss2l DMC2280 [params \ @@ -567,6 +587,7 @@ Motor ss2l DMC2280 [params \ motorHome $ss2l_Home] setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange ss2l movecount $move_count +ss2l part filter # Slit 2, up Motor ss2u DMC2280 [params \ @@ -584,6 +605,7 @@ Motor ss2u DMC2280 [params \ motorHome $ss2u_Home] setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange ss2u movecount $move_count +ss2u part filter # Slit 2, down Motor ss2d DMC2280 [params \ @@ -601,6 +623,7 @@ Motor ss2d DMC2280 [params \ motorHome $ss2d_Home] setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange ss2d movecount $move_count +ss2d part filter proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]} proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}