diff --git a/site_ansto/instrument/hrpd/motor_configuration.tcl b/site_ansto/instrument/hrpd/motor_configuration.tcl index 24b80dcb..125f6594 100644 --- a/site_ansto/instrument/hrpd/motor_configuration.tcl +++ b/site_ansto/instrument/hrpd/motor_configuration.tcl @@ -89,10 +89,10 @@ Motor mx DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX 25000\ + stepsPerX -25000\ absEnc 1\ absEncHome 7562793\ - cntsPerX 8192] + cntsPerX -8192] setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20 mx speed 1 mx precision 0.01 @@ -109,7 +109,7 @@ Motor mom DMC2280 [params \ stepsPerX -12500\ absEnc 1\ absEncHome 17694127\ - cntsPerX -8192] + cntsPerX -4096] setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180 mom speed 1 mom precision 0.01 @@ -260,7 +260,7 @@ Motor stth DMC2280 [params \ port $dmc2280_controller2(port)\ axis F\ units degrees\ - maxSpeed 0.2\ + maxSpeed 0.5\ maxAccel 0.2\ maxDecel 0.2\ stepsPerX 125000\ @@ -272,21 +272,23 @@ stth hardupperlim 74 stth softlowerlim -70 stth softupperlim 70 stth home 0 -stth speed 0.2 +stth speed 0.5 stth precision 0.01 #Default upper and lower ranges for vertical slits -set vertSlitLowRange 25 -set vertSlitUpRange 95 +set vertSlitLowRange 20 +set vertSlitUpRange 100 #Default upper and lower ranges for horizontal slits -set horSlitLowRange 20 -set horSlitUpRange 25 +set horSlitLowRange 15 +set horSlitUpRange 35 + +#Measured or computed slit motor steps per millimetre +set slitStepRate 20180 ############################ # Motor Controller 3 ############################ -#:TP at HOME # # Monochromator radius, focus @@ -314,8 +316,8 @@ Motor ss1r DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 544860] + stepsPerX -$slitStepRate\ + motorHome [expr 54.5/2*$slitStepRate]] setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange Motor ss1l DMC2280 [params \ @@ -326,8 +328,8 @@ Motor ss1l DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 544860] + stepsPerX -$slitStepRate\ + motorHome [expr 54.5/2*$slitStepRate]] setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange Motor ss1u DMC2280 [params \ @@ -338,8 +340,8 @@ Motor ss1u DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 2098720] + stepsPerX -$slitStepRate\ + motorHome [expr 207.5/2*$slitStepRate]] setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange Motor ss1d DMC2280 [params \ @@ -350,14 +352,13 @@ Motor ss1d DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 2098720] + stepsPerX -$slitStepRate\ + motorHome [expr 207.5/2*$slitStepRate]] setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange ############################ # Motor Controller 4 ############################ -#:TP at HOME # # Little is known about the Eularian Cradle @@ -397,8 +398,8 @@ Motor ss2r DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 524680] + stepsPerX -$slitStepRate\ + motorHome [expr 52.25/2*$slitStepRate]] setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange Motor ss2l DMC2280 [params \ @@ -409,8 +410,8 @@ Motor ss2l DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 524680] + stepsPerX -$slitStepRate\ + motorHome [expr 52.25/2*$slitStepRate]] setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange Motor ss2u DMC2280 [params \ @@ -421,8 +422,8 @@ Motor ss2u DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 2058360] + stepsPerX -$slitStepRate\ + motorHome [expr 204.1/2*$slitStepRate]] setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange Motor ss2d DMC2280 [params \ @@ -433,8 +434,8 @@ Motor ss2d DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX -20180\ - motorHome 2058360] + stepsPerX -$slitStepRate\ + motorHome [expr 204.1/2*$slitStepRate]] setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}