Reorganization and recalibration (partial)
r1421 | dcl | 2007-02-01 17:05:55 +1100 (Thu, 01 Feb 2007) | 2 lines
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
# $Revision: 1.12 $
|
# $Revision: 1.13 $
|
||||||
# $Date: 2007-01-18 03:15:58 $
|
# $Date: 2007-02-01 06:05:55 $
|
||||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||||
# Last revision by: $Author: dcl $
|
# Last revision by: $Author: dcl $
|
||||||
|
|
||||||
@@ -95,6 +95,7 @@ Motor mphi DMC2280 [params \
|
|||||||
cntsPerX -8192]
|
cntsPerX -8192]
|
||||||
setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15
|
setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15
|
||||||
mphi speed 1
|
mphi speed 1
|
||||||
|
mphi movecount 100
|
||||||
mphi precision 0.01
|
mphi precision 0.01
|
||||||
|
|
||||||
# Monochromator chi, Tilt 2, lower
|
# Monochromator chi, Tilt 2, lower
|
||||||
@@ -112,6 +113,7 @@ Motor mchi DMC2280 [params \
|
|||||||
cntsPerX 8192]
|
cntsPerX 8192]
|
||||||
setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15
|
setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15
|
||||||
mchi speed 1
|
mchi speed 1
|
||||||
|
mchi movecount 100
|
||||||
mchi precision 0.01
|
mchi precision 0.01
|
||||||
|
|
||||||
# Monochromator Trans 1, upper
|
# Monochromator Trans 1, upper
|
||||||
@@ -129,6 +131,7 @@ Motor my DMC2280 [params \
|
|||||||
cntsPerX 8192]
|
cntsPerX 8192]
|
||||||
setHomeandRange -motor my -home 0 -lowrange 20 -uprange 20
|
setHomeandRange -motor my -home 0 -lowrange 20 -uprange 20
|
||||||
my speed 1
|
my speed 1
|
||||||
|
my movecount 100
|
||||||
my precision 0.01
|
my precision 0.01
|
||||||
|
|
||||||
# Monochromator Trans 2, lower
|
# Monochromator Trans 2, lower
|
||||||
@@ -146,6 +149,7 @@ Motor mx DMC2280 [params \
|
|||||||
cntsPerX -8192]
|
cntsPerX -8192]
|
||||||
setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20
|
setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20
|
||||||
mx speed 1
|
mx speed 1
|
||||||
|
mx movecount 100
|
||||||
mx precision 0.01
|
mx precision 0.01
|
||||||
|
|
||||||
# Monochromator omega, rotate
|
# Monochromator omega, rotate
|
||||||
@@ -163,6 +167,7 @@ Motor mom DMC2280 [params \
|
|||||||
cntsPerX -4096]
|
cntsPerX -4096]
|
||||||
setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
|
setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
|
||||||
mom speed 1
|
mom speed 1
|
||||||
|
mom movecount 100
|
||||||
mom precision 0.01
|
mom precision 0.01
|
||||||
|
|
||||||
# Monochromator two-theta, flight-tube rotate
|
# Monochromator two-theta, flight-tube rotate
|
||||||
@@ -184,6 +189,7 @@ mtth softlowerlim 90
|
|||||||
mtth softupperlim 137
|
mtth softupperlim 137
|
||||||
mtth home 90
|
mtth home 90
|
||||||
mtth speed 0.2
|
mtth speed 0.2
|
||||||
|
mtth movecount 100
|
||||||
mtth accel 0.01
|
mtth accel 0.01
|
||||||
mtth decel 0.01
|
mtth decel 0.01
|
||||||
mtth precision 0.02
|
mtth precision 0.02
|
||||||
@@ -205,6 +211,7 @@ Motor pcx DMC2280 [params \
|
|||||||
cntsPerX [expr 8192/6]]
|
cntsPerX [expr 8192/6]]
|
||||||
setHomeandRange -motor pcx -home 0 -lowrange 0 -uprange 140
|
setHomeandRange -motor pcx -home 0 -lowrange 0 -uprange 140
|
||||||
pcx speed 1
|
pcx speed 1
|
||||||
|
pcx movecount 100
|
||||||
pcx precision 0.01
|
pcx precision 0.01
|
||||||
|
|
||||||
# Primary Collimator Rotation
|
# Primary Collimator Rotation
|
||||||
@@ -222,6 +229,7 @@ Motor pcr DMC2280 [params \
|
|||||||
cntsPerX [expr 8192/(360/100)]]
|
cntsPerX [expr 8192/(360/100)]]
|
||||||
setHomeandRange -motor pcr -home 0 -lowrange 10 -uprange 10
|
setHomeandRange -motor pcr -home 0 -lowrange 10 -uprange 10
|
||||||
pcr speed 0.1
|
pcr speed 0.1
|
||||||
|
pcr movecount 100
|
||||||
pcr precision 0.01
|
pcr precision 0.01
|
||||||
|
|
||||||
############################
|
############################
|
||||||
@@ -245,6 +253,7 @@ Motor sphi DMC2280 [params \
|
|||||||
cntsPerX -8192]
|
cntsPerX -8192]
|
||||||
setHomeandRange -motor sphi -home 0 -lowrange 20 -uprange 20
|
setHomeandRange -motor sphi -home 0 -lowrange 20 -uprange 20
|
||||||
sphi speed 1
|
sphi speed 1
|
||||||
|
sphi movecount 100
|
||||||
sphi precision 0.01
|
sphi precision 0.01
|
||||||
|
|
||||||
# Sample Tilt 2, lower, chi
|
# Sample Tilt 2, lower, chi
|
||||||
@@ -262,6 +271,7 @@ Motor schi DMC2280 [params \
|
|||||||
cntsPerX 8192]
|
cntsPerX 8192]
|
||||||
setHomeandRange -motor schi -home 90 -lowrange 20 -uprange 20
|
setHomeandRange -motor schi -home 90 -lowrange 20 -uprange 20
|
||||||
schi speed 1
|
schi speed 1
|
||||||
|
schi movecount 100
|
||||||
schi precision 0.01
|
schi precision 0.01
|
||||||
|
|
||||||
# Sample Trans 1, upper, y
|
# Sample Trans 1, upper, y
|
||||||
@@ -279,6 +289,7 @@ Motor sy DMC2280 [params \
|
|||||||
cntsPerX 8192]
|
cntsPerX 8192]
|
||||||
setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20
|
setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20
|
||||||
sy speed 1
|
sy speed 1
|
||||||
|
sy movecount 100
|
||||||
sy precision 0.01
|
sy precision 0.01
|
||||||
|
|
||||||
# Sample Trans2, lower, x
|
# Sample Trans2, lower, x
|
||||||
@@ -296,6 +307,7 @@ Motor sx DMC2280 [params \
|
|||||||
cntsPerX -8192]
|
cntsPerX -8192]
|
||||||
setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20
|
setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20
|
||||||
sx speed 1
|
sx speed 1
|
||||||
|
sx movecount 100
|
||||||
sx precision 0.01
|
sx precision 0.01
|
||||||
|
|
||||||
# Sample Omega, rotate
|
# Sample Omega, rotate
|
||||||
@@ -313,6 +325,7 @@ Motor som DMC2280 [params \
|
|||||||
cntsPerX 4096]
|
cntsPerX 4096]
|
||||||
setHomeandRange -motor som -home 0 -lowrange 142 -uprange 218
|
setHomeandRange -motor som -home 0 -lowrange 142 -uprange 218
|
||||||
som speed 1
|
som speed 1
|
||||||
|
som movecount 100
|
||||||
som precision 0.01
|
som precision 0.01
|
||||||
|
|
||||||
# Sample two-theta, detector rotate
|
# Sample two-theta, detector rotate
|
||||||
@@ -334,6 +347,7 @@ stth softlowerlim -77
|
|||||||
stth softupperlim 74
|
stth softupperlim 74
|
||||||
stth home 0
|
stth home 0
|
||||||
stth speed 0.5
|
stth speed 0.5
|
||||||
|
stth movecount 100
|
||||||
stth precision 0.01
|
stth precision 0.01
|
||||||
|
|
||||||
############################
|
############################
|
||||||
@@ -358,6 +372,7 @@ stth precision 0.01
|
|||||||
# cntsPerX xxxx]
|
# cntsPerX xxxx]
|
||||||
#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
|
#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
|
||||||
#mf1 speed 1
|
#mf1 speed 1
|
||||||
|
#mfl movecount 100
|
||||||
#mf1 precision 0.01
|
#mf1 precision 0.01
|
||||||
|
|
||||||
# Slit 1, right
|
# Slit 1, right
|
||||||
@@ -372,6 +387,7 @@ Motor ss1r DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss1r_Home]
|
motorHome $ss1r_Home]
|
||||||
setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||||
|
ss1r movecount 100
|
||||||
|
|
||||||
# Slit 1, left
|
# Slit 1, left
|
||||||
Motor ss1l DMC2280 [params \
|
Motor ss1l DMC2280 [params \
|
||||||
@@ -385,6 +401,7 @@ Motor ss1l DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss1l_Home]
|
motorHome $ss1l_Home]
|
||||||
setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||||
|
ss1l movecount 100
|
||||||
|
|
||||||
# Slit 1, up
|
# Slit 1, up
|
||||||
Motor ss1u DMC2280 [params \
|
Motor ss1u DMC2280 [params \
|
||||||
@@ -398,6 +415,7 @@ Motor ss1u DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss1u_Home]
|
motorHome $ss1u_Home]
|
||||||
setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||||
|
ss1u movecount 100
|
||||||
|
|
||||||
# Slit 1, down
|
# Slit 1, down
|
||||||
Motor ss1d DMC2280 [params \
|
Motor ss1d DMC2280 [params \
|
||||||
@@ -411,6 +429,7 @@ Motor ss1d DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss1d_Home]
|
motorHome $ss1d_Home]
|
||||||
setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||||
|
ss1d movecount 100
|
||||||
|
|
||||||
############################
|
############################
|
||||||
# Motor Controller 4
|
# Motor Controller 4
|
||||||
@@ -461,6 +480,7 @@ Motor ss2r DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss2r_Home]
|
motorHome $ss2r_Home]
|
||||||
setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||||
|
ss2r movecount 100
|
||||||
|
|
||||||
# Slit 2, left
|
# Slit 2, left
|
||||||
Motor ss2l DMC2280 [params \
|
Motor ss2l DMC2280 [params \
|
||||||
@@ -474,6 +494,7 @@ Motor ss2l DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss2l_Home]
|
motorHome $ss2l_Home]
|
||||||
setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||||
|
ss2l movecount 100
|
||||||
|
|
||||||
# Slit 2, up
|
# Slit 2, up
|
||||||
Motor ss2u DMC2280 [params \
|
Motor ss2u DMC2280 [params \
|
||||||
@@ -487,6 +508,7 @@ Motor ss2u DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss2u_Home]
|
motorHome $ss2u_Home]
|
||||||
setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||||
|
ss2u movecount 100
|
||||||
|
|
||||||
# Slit 2, down
|
# Slit 2, down
|
||||||
Motor ss2d DMC2280 [params \
|
Motor ss2d DMC2280 [params \
|
||||||
@@ -500,6 +522,7 @@ Motor ss2d DMC2280 [params \
|
|||||||
stepsPerX -$slitStepRate\
|
stepsPerX -$slitStepRate\
|
||||||
motorHome $ss2d_Home]
|
motorHome $ss2d_Home]
|
||||||
setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||||
|
ss2d movecount 100
|
||||||
|
|
||||||
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
|
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
|
||||||
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
|
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
|
||||||
|
|||||||
Reference in New Issue
Block a user