Update to match Echidna more closely
r1339 | dcl | 2006-12-01 15:10:04 +1100 (Fri, 01 Dec 2006) | 2 lines
This commit is contained in:
@@ -34,9 +34,9 @@ Motor mphi DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7414753\
|
||||
cntsPerX -8192]
|
||||
setHomeandRange -motor mphi -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15
|
||||
mphi speed 1
|
||||
mphi precision 0.01
|
||||
mphi precision 0.001
|
||||
|
||||
# Monochromator chi, Tilt 2, lower
|
||||
Motor mchi DMC2280 [params \
|
||||
@@ -51,9 +51,9 @@ Motor mchi DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7818915\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor mchi -home 90 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15
|
||||
mchi speed 1
|
||||
mchi precision 0.01
|
||||
mchi precision 0.001
|
||||
|
||||
# Monochromator Trans 1, upper
|
||||
Motor my DMC2280 [params \
|
||||
@@ -68,7 +68,7 @@ Motor my DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7781680\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor my -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor my -home 0 -lowrange 20 -uprange 20
|
||||
my speed 1
|
||||
my precision 0.01
|
||||
|
||||
@@ -85,7 +85,7 @@ Motor mx DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7562793\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor mx -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20
|
||||
mx speed 1
|
||||
mx precision 0.01
|
||||
|
||||
@@ -102,7 +102,7 @@ Motor mom DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 17694127\
|
||||
cntsPerX -8192]
|
||||
setHomeandRange -motor mom -home 0 -lowrange 15 -uprange 15
|
||||
setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
|
||||
mom speed 1
|
||||
mom precision 0.01
|
||||
|
||||
@@ -127,13 +127,6 @@ mtth home 120
|
||||
mtth speed 0.5
|
||||
mtth precision 0.01
|
||||
|
||||
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
|
||||
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
|
||||
publish mthSet user
|
||||
publish mthGet user
|
||||
MakeConfigurableMotor mth
|
||||
mth readscript mthGet
|
||||
mth drivescript mthSet
|
||||
|
||||
# Sample Tilt 1, upper
|
||||
Motor sphi DMC2280 [params \
|
||||
@@ -148,7 +141,7 @@ Motor sphi DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7934290\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor sphi -home 0 -lowrange 20 -uprange 20
|
||||
sphi speed 1
|
||||
sphi precision 0.01
|
||||
|
||||
@@ -165,7 +158,7 @@ Motor schi DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7581355\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor schi -home 90 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor schi -home 90 -lowrange 20 -uprange 20
|
||||
schi speed 1
|
||||
schi precision 0.01
|
||||
|
||||
@@ -182,7 +175,7 @@ Motor sy DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7562793\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor sy -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20
|
||||
sy speed 1
|
||||
sy precision 0.01
|
||||
|
||||
@@ -199,7 +192,7 @@ Motor sx DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 7562793\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor sx -home 0 -lowrange 5 -uprange 5
|
||||
setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20
|
||||
sx speed 1
|
||||
sx precision 0.01
|
||||
|
||||
@@ -216,7 +209,7 @@ Motor som DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 17694127\
|
||||
cntsPerX -8192]
|
||||
setHomeandRange -motor som -home 0 -lowrange 45 -uprange 45
|
||||
setHomeandRange -motor som -home 0 -lowrange 180 -uprange 180
|
||||
som speed 1
|
||||
som precision 0.01
|
||||
|
||||
@@ -233,18 +226,14 @@ Motor stth DMC2280 [params \
|
||||
absEnc 1\
|
||||
absEncHome 6559259\
|
||||
cntsPerX 93207]
|
||||
setHomeandRange -motor stth -home 120 -lowrange 15 -uprange 15
|
||||
stth hardlowerlim 85
|
||||
stth hardupperlim 155
|
||||
stth softlowerlim 85
|
||||
stth softupperlim 155
|
||||
stth home 87.635
|
||||
stth speed 0.5
|
||||
stth precision 0.01
|
||||
|
||||
proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
|
||||
proc sthSet {val} { return "stth=[SplitReply [stth]]"}
|
||||
publish sthSet user
|
||||
publish sthGet user
|
||||
MakeConfigurableMotor sth
|
||||
sth readscript sthGet
|
||||
sth drivescript sthSet
|
||||
|
||||
#Default upper and lower ranges for vertical slits
|
||||
set vertSlitLowRange 25
|
||||
set vertSlitUpRange 95
|
||||
@@ -258,7 +247,7 @@ set horSlitUpRange 25
|
||||
# host $dmc2280_controller3(host)\
|
||||
# port $dmc2280_controller3(port)\
|
||||
# axis A\
|
||||
# units xxxx\
|
||||
# units degrees\
|
||||
# maxSpeed xxxx\
|
||||
# maxAccel xxxx\
|
||||
# maxDecel xxxx\
|
||||
@@ -266,7 +255,7 @@ set horSlitUpRange 25
|
||||
# absEnc 1\
|
||||
# absEncHome xxxx\
|
||||
# cntsPerX xxxx]
|
||||
#setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 0
|
||||
#setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 360
|
||||
#mr speed 1
|
||||
#mr precision 0.01
|
||||
|
||||
@@ -366,6 +355,22 @@ Motor ss2l DMC2280 [params \
|
||||
motorHome 500000]
|
||||
setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||
|
||||
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
|
||||
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
|
||||
publish mthSet user
|
||||
publish mthGet user
|
||||
MakeConfigurableMotor mth
|
||||
mth readscript mthGet
|
||||
mth drivescript mthSet
|
||||
|
||||
proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
|
||||
proc sthSet {val} { return "stth=[SplitReply [stth]]"}
|
||||
publish sthGet user
|
||||
publish sthSet user
|
||||
MakeConfigurableMotor sth
|
||||
sth readscript sthGet
|
||||
sth drivescript sthSet
|
||||
|
||||
#--------------------------------------------------------
|
||||
proc ss1widthscript {val} {
|
||||
set currentWidth [expr [SplitReply [ss1r]] + [SplitReply [ss1l]]]
|
||||
@@ -545,4 +550,3 @@ ss2vo drivescript ss2vertoffsetscript
|
||||
ss2vo readscript ss2readvertoffset
|
||||
|
||||
# END MOTOR CONFIGURATION
|
||||
|
||||
|
||||
Reference in New Issue
Block a user