diff --git a/site_ansto/instrument/hrpd/hrpd_configuration.tcl b/site_ansto/instrument/hrpd/hrpd_configuration.tcl index 9cc2df20..761dfef5 100644 --- a/site_ansto/instrument/hrpd/hrpd_configuration.tcl +++ b/site_ansto/instrument/hrpd/hrpd_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.18 $ -# $Date: 2006-10-05 02:44:50 $ +# $Revision: 1.19 $ +# $Date: 2006-10-09 03:20:44 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ @@ -67,31 +67,29 @@ set dmc2280_controller4(port) 1034 # Run slit homing routines on controllers 3 and 4 if [catch {dmc_connect dmc2280_controller3} ] { - dmc_sendCmd dmc2280_controller3 "XQ#HOME,1" + dmc_sendCmd dmc2280_controller3 "XQ#HOME,1" + dmc_close dmc2280_controller3 } if [catch {dmc_connect dmc2280_controller4} ] { dmc_sendCmd dmc2280_controller4 "XQ#HOME,1" + dmc_close dmc2280_controller4 } -#Motor mom DMC2280 [params \ -# host $dmc2280_controller1(host)\ -# port $dmc2280_controller1(port)\ -# axis E\ -# units xxxx\ -# maxSpeed xxxx\ -# maxAccel xxxx\ -# maxDecel xxxx\ -# stepsPerX xxxx\ -# absEnc 1\ -# absEncHome xxxx\ -# cntsPerX xxxx] -#mom hardlowerlim -180 -#mom hardupperlim 180 -#mom softlowerlim -180 -#mom softupperlim 180 -#mom home 0 -#mom speed xxx -#mom precision xxx +Motor mom DMC2280 [params \ + host $dmc2280_controller1(host)\ + port $dmc2280_controller1(port)\ + axis E\ + units degrees\ + maxSpeed 1\ + maxAccel 1\ + maxDecel 1\ + stepsPerX -12500\ + absEnc 1\ + absEncHome 17694127\ + cntsPerX -8192] +setHomeandRange -motor mom -home 0 -lowrange 15 -uprange 15 +mom speed 1 +mom precision 0.01 Motor mtth DMC2280 [params \ host $dmc2280_controller1(host)\ @@ -111,7 +109,7 @@ mtth softlowerlim 85 mtth softupperlim 135 mtth home 87.635 mtth speed 0.5 -mtth precision 0.001 +mtth precision 0.01 proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]} publish mthGet user @@ -138,7 +136,7 @@ Motor mchi DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor mchi -home 90 -lowrange 5 -uprange 5 mchi speed 1 -mchi precision 0.001 +mchi precision 0.01 # Monochromoter Tilt 1, upper Motor mphi DMC2280 [params \ @@ -155,7 +153,7 @@ Motor mphi DMC2280 [params \ cntsPerX -8192] setHomeandRange -motor mphi -home 0 -lowrange 5 -uprange 5 mphi speed 1 -mphi precision 0.001 +mphi precision 0.01 # Monochromoter Trans 1, upper Motor mz DMC2280 [params \ @@ -172,7 +170,7 @@ Motor mz DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor mz -home 0 -lowrange 5 -uprange 5 mz speed 1 -mz precision 0.001 +mz precision 0.01 # Monochromoter Trans 2, lower Motor mx DMC2280 [params \ @@ -185,53 +183,53 @@ Motor mx DMC2280 [params \ maxDecel 1\ stepsPerX 25000\ absEnc 1\ - absEncHome xxxx\ + absEncHome 7562793\ cntsPerX 8192] setHomeandRange -motor mx -home 0 -lowrange 5 -uprange 5 mx speed 1 -mx precision 0.001 +mx precision 0.01 -Motor mr DMC2280 [params \ - host $dmc2280_controller3(host)\ - port $dmc2280_controller3(port)\ - axis A\ - units xxxx\ - maxSpeed xxxx\ - maxAccel xxxx\ - maxDecel xxxx\ - stepsPerX xxxx\ - absEnc 1\ - absEncHome xxxx\ - cntsPerX xxxx] -setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 0 -mr speed 1 -#mr precision 0.001 +#Motor mr DMC2280 [params \ +# host $dmc2280_controller3(host)\ +# port $dmc2280_controller3(port)\ +# axis A\ +# units xxxx\ +# maxSpeed xxxx\ +# maxAccel xxxx\ +# maxDecel xxxx\ +# stepsPerX xxxx\ +# absEnc 1\ +# absEncHome xxxx\ +# cntsPerX xxxx] +#setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 0 +#mr speed 1 +#mr precision 0.01 -Motor pc1 DMC2280 [params \ - host $dmc2280_controller1(host)\ - port $dmc2280_controller1(port)\ - axis F\ - units xxxx\ - maxSpeed xxxx\ - maxAccel xxxx\ - maxDecel xxxx\ - stepsPerX xxxx] -setHomeandRange -motor pc1 -home 0 -lowrange 0 -uprange 0 -pc1 speed 1 -#pc1 precision xxxx +#Motor pc1 DMC2280 [params \ +# host $dmc2280_controller1(host)\ +# port $dmc2280_controller1(port)\ +# axis F\ +# units xxxx\ +# maxSpeed xxxx\ +# maxAccel xxxx\ +# maxDecel xxxx\ +# stepsPerX xxxx] +#setHomeandRange -motor pc1 -home 0 -lowrange 0 -uprange 0 +#pc1 speed 1 +#pc1 precision 0.01 -Motor pc2 DMC2280 [params \ - host $dmc2280_controller1(host)\ - port $dmc2280_controller1(port)\ - axis G\ - units xxxx\ - maxSpeed xxxx\ - maxAccel xxxx\ - maxDecel xxxx\ - stepsPerX xxxx] -setHomeandRange -motor pc2 -home 0 -lowrange 0 -uprange 0 -pc2 speed 1 -#pc2 precision xxxx +#Motor pc2 DMC2280 [params \ +# host $dmc2280_controller1(host)\ +# port $dmc2280_controller1(port)\ +# axis G\ +# units xxxx\ +# maxSpeed xxxx\ +# maxAccel xxxx\ +# maxDecel xxxx\ +# stepsPerX xxxx] +#setHomeandRange -motor pc2 -home 0 -lowrange 0 -uprange 0 +#pc2 speed 1 +#pc2 precision 0.01 Motor som DMC2280 [params \ host $dmc2280_controller2(host)\ @@ -247,7 +245,7 @@ Motor som DMC2280 [params \ cntsPerX -8192] setHomeandRange -motor som -home 0 -lowrange 45 -uprange 45 som speed 1 -som precision 0.001 +som precision 0.01 Motor stth DMC2280 [params \ host $dmc2280_controller2(host)\ @@ -264,7 +262,7 @@ Motor stth DMC2280 [params \ cntsPerX 93207] setHomeandRange -motor stth -home 120 -lowrange 15 -uprange 15 stth speed 0.5 -stth precision 0.001 +stth precision 0.01 proc sthGet {} { return [expr [SplitReply [stth]]/2.0]} publish sthGet user @@ -291,7 +289,7 @@ Motor schi DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor schi -home 90 -lowrange 5 -uprange 5 schi speed 1 -schi precision 0.001 +schi precision 0.01 # Sample Tilt 1, upper Motor sphi DMC2280 [params \ @@ -309,7 +307,7 @@ Motor sphi DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5 sphi speed 1 -sphi precision 0.001 +sphi precision 0.01 # Sample Trans 1 (upper) Motor sz DMC2280 [params \ @@ -326,7 +324,7 @@ Motor sz DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor sz -home 0 -lowrange 5 -uprange 5 sz speed 1 -sz precision 0.001 +sz precision 0.01 # Sample Trans2 (lower) Motor sx DMC2280 [params \ @@ -343,7 +341,7 @@ Motor sx DMC2280 [params \ cntsPerX 8192] setHomeandRange -motor sx -home 0 -lowrange 5 -uprange 5 sx speed 1 -sx precision 0.001 +sx precision 0.01 #Default upper and lower ranges for vertical slits set vertSlitLowRange 25