Add movecount from echidna, reduce mtth settling to 5 seconds

r1547 | dcl | 2007-02-23 08:17:25 +1100 (Fri, 23 Feb 2007) | 2 lines
This commit is contained in:
Douglas Clowes
2007-02-23 08:17:25 +11:00
parent 66448923f1
commit 961aa0b8aa

View File

@@ -1,5 +1,5 @@
# $Revision: 1.2 $
# $Date: 2007-02-22 05:36:25 $
# $Revision: 1.3 $
# $Date: 2007-02-22 21:17:25 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $
@@ -67,6 +67,10 @@ set horSlitHome 0
set horSlitLowRange 25
set horSlitUpRange 25
# set movecount high to reduce the frequency of
# hnotify messages to a reasonable level
set move_count 100
# Run slit homing routines on controllers 3 and 4
#if [catch {dmc_connect dmc2280_controller3} ] {
# dmc_sendCmd dmc2280_controller3 "XQ#HOME,1"
@@ -102,6 +106,7 @@ Motor mphi DMC2280 [params \
cntsPerX -8192]
setHomeandRange -motor mphi -home 0 -lowrange 5 -uprange 5
mphi speed 1
mphi movecount $move_count
mphi precision 0.01
# Monochromator chi, Tilt 2, lower
@@ -121,6 +126,7 @@ Motor mchi DMC2280 [params \
cntsPerX 8192]
setHomeandRange -motor mchi -home 90 -lowrange 5 -uprange 5
mchi speed 1
mchi movecount $move_count
mchi precision 0.01
# Monochromator Trans 1, upper
@@ -140,6 +146,7 @@ Motor my DMC2280 [params \
cntsPerX 8192]
setHomeandRange -motor my -home 0 -lowrange 10 -uprange 10
my speed 1
my movecount $move_count
my precision 0.01
# Monochromator Trans 2, lower
@@ -159,6 +166,7 @@ Motor mx DMC2280 [params \
cntsPerX -8192]
setHomeandRange -motor mx -home 0 -lowrange 10 -uprange 10
mx speed 1
mx movecount $move_count
mx precision 0.01
# Monochromator omega, rotate
@@ -178,6 +186,7 @@ Motor mom DMC2280 [params \
cntsPerX -4096]
setHomeandRange -motor mom -home 0 -lowrange 5 -uprange 95
mom speed 1
mom movecount $move_count
mom precision 0.01
# Monochromator two-theta, flight-tube rotate
@@ -193,7 +202,7 @@ Motor mtth DMC2280 [params \
maxDecel 0.2\
stepsPerX [expr 25000*10]\
airpads 1\
settle 10\
settle 5\
motoffdelay 5000\
absEnc 1\
absEncHome $mtth_Home\
@@ -202,6 +211,7 @@ mtth softlowerlim 45
mtth softupperlim 100
mtth home 90
mtth speed 0.2
mtth movecount $move_count
mtth accel 0.01
mtth decel 0.01
mtth precision 0.01
@@ -233,6 +243,7 @@ Motor sphi DMC2280 [params \
cntsPerX -8192]
setHomeandRange -motor sphi -home 0 -lowrange 15 -uprange 15
sphi speed 1
sphi movecount $move_count
sphi precision 0.01
# Sample Tilt 2, lower, chi
@@ -252,6 +263,7 @@ Motor schi DMC2280 [params \
cntsPerX 8192]
setHomeandRange -motor schi -home 90 -lowrange 15 -uprange 15
schi speed 1
schi movecount $move_count
schi precision 0.01
# Sample Trans 1, upper, y
@@ -271,6 +283,7 @@ Motor sy DMC2280 [params \
cntsPerX 8192]
setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20
sy speed 1
sy movecount $move_count
sy precision 0.01
# Sample Trans2, lower, x
@@ -290,6 +303,7 @@ Motor sx DMC2280 [params \
cntsPerX -8192]
setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20
sx speed 1
sx movecount $move_count
sx precision 0.01
# Sample Omega, rotate
@@ -330,6 +344,7 @@ stth softlowerlim -60
stth softupperlim 80
stth home 0
stth speed 0.5
stth movecount $move_count
stth precision 0.01
# Oscillating Collimator Translation
@@ -377,6 +392,7 @@ oct precision 0.01
# cntsPerX xxxx]
#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
#mf1 speed 1
#mfl movecount $move_count
#mf1 precision 0.01
# Monochromator Focusing (Ge)
@@ -412,6 +428,7 @@ Motor ss1r DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss1r_Home]
setHomeandRange -motor ss1r -home $horSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
ss1r movecount $move_count
# Slit 1, left
Motor ss1l DMC2280 [params \
@@ -427,6 +444,7 @@ Motor ss1l DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss1l_Home]
setHomeandRange -motor ss1l -home $horSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
ss1l movecount $move_count
# Slit 1, up
Motor ss1u DMC2280 [params \
@@ -442,6 +460,7 @@ Motor ss1u DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss1u_Home]
setHomeandRange -motor ss1u -home $horSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
ss1u movecount $move_count
# Slit 1, down
Motor ss1d DMC2280 [params \
@@ -457,6 +476,7 @@ Motor ss1d DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss1d_Home]
setHomeandRange -motor ss1d -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
ss1d movecount $move_count
############################
# Motor Controller 4
@@ -479,6 +499,7 @@ Motor ss2r DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss2r_Home]
setHomeandRange -motor ss2r -home $vertSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
ss2r movecount $move_count
# Slit 2, left
Motor ss2l DMC2280 [params \
@@ -494,6 +515,7 @@ Motor ss2l DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss2l_Home]
setHomeandRange -motor ss2l -home $vertSlitHome -lowrange $horSlitLowRange -uprange $horSlitUpRange
ss2l movecount $move_count
# Slit 2, up
Motor ss2u DMC2280 [params \
@@ -509,6 +531,7 @@ Motor ss2u DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss2u_Home]
setHomeandRange -motor ss2u -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
ss2u movecount $move_count
# Slit 2, down
Motor ss2d DMC2280 [params \
@@ -524,6 +547,7 @@ Motor ss2d DMC2280 [params \
stepsPerX -$slitStepRate\
motorHome $ss2d_Home]
setHomeandRange -motor ss2d -home $vertSlitHome -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
ss2d movecount $move_count
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}