Both hipd and hrpd motors have now been configured with part identifiers and and long names, and the hpaths now use the long_name fields.
r1766 | ffr | 2007-04-01 11:58:58 +1000 (Sun, 01 Apr 2007) | 2 lines
This commit is contained in:
committed by
Douglas Clowes
parent
6d17aca411
commit
4712347649
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.9 $
|
||||
# $Date: 2007-03-31 03:34:29 $
|
||||
# $Revision: 1.10 $
|
||||
# $Date: 2007-04-01 01:58:58 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -132,6 +132,7 @@ mchi speed 1
|
||||
mchi movecount $move_count
|
||||
mchi precision 0.01
|
||||
mchi part crystal
|
||||
mchi long_name chi
|
||||
|
||||
# Monochromator Trans 1, upper
|
||||
Motor my DMC2280 [params \
|
||||
@@ -154,6 +155,7 @@ my speed 1
|
||||
my movecount $move_count
|
||||
my precision 0.01
|
||||
my part crystal
|
||||
my long_name translate_y
|
||||
|
||||
# Monochromator Trans 2, lower
|
||||
Motor mx DMC2280 [params \
|
||||
@@ -176,6 +178,7 @@ mx speed 1
|
||||
mx movecount $move_count
|
||||
mx precision 0.01
|
||||
mx part crystal
|
||||
mx long_name translate_x
|
||||
|
||||
# Monochromator omega, rotate
|
||||
Motor mom DMC2280 [params \
|
||||
@@ -198,6 +201,7 @@ mom speed 1
|
||||
mom movecount $move_count
|
||||
mom precision 0.01
|
||||
mom part crystal
|
||||
mom long_name omega
|
||||
|
||||
# Monochromator two-theta, flight-tube rotate
|
||||
Motor mtth DMC2280 [params \
|
||||
@@ -230,6 +234,7 @@ mtth maxretry 10
|
||||
mtth failafter 10
|
||||
mtth blockage_check_interval 5
|
||||
mtth part crystal
|
||||
mtth long_name takeoff_angle
|
||||
|
||||
# Primary Collimator Translation X
|
||||
Motor pcx DMC2280 [params \
|
||||
@@ -251,7 +256,8 @@ setHomeandRange -motor pcx -home 0 -lowrange 0 -uprange 148
|
||||
pcx speed 1
|
||||
pcx movecount $move_count
|
||||
pcx precision 0.01
|
||||
pcx part crystal
|
||||
pcx part collimator
|
||||
pcx long_name primary_collimator_translation
|
||||
|
||||
# Primary Collimator Rotation
|
||||
Motor pcr DMC2280 [params \
|
||||
@@ -273,7 +279,8 @@ setHomeandRange -motor pcr -home 0 -lowrange 5 -uprange 185
|
||||
pcr speed 0.1
|
||||
pcr movecount $move_count
|
||||
pcr precision 0.01
|
||||
pcr part crystal
|
||||
pcr part collimator
|
||||
pcr long_name primary_collimator_rotation
|
||||
|
||||
############################
|
||||
# Motor Controller 2
|
||||
@@ -302,6 +309,7 @@ sphi speed 1
|
||||
sphi movecount $move_count
|
||||
sphi precision 0.01
|
||||
sphi part sample
|
||||
sphi long_name phi
|
||||
|
||||
# Sample Tilt 2, lower, chi
|
||||
Motor schi DMC2280 [params \
|
||||
@@ -324,6 +332,7 @@ schi speed 1
|
||||
schi movecount $move_count
|
||||
schi precision 0.01
|
||||
schi part sample
|
||||
schi long_name chi
|
||||
|
||||
# Sample Trans 1, upper, y
|
||||
Motor sy DMC2280 [params \
|
||||
@@ -346,6 +355,7 @@ sy speed 1
|
||||
sy movecount $move_count
|
||||
sy precision 0.01
|
||||
sy part sample
|
||||
sy long_name translate_y
|
||||
|
||||
# Sample Trans2, lower, x
|
||||
Motor sx DMC2280 [params \
|
||||
@@ -368,6 +378,7 @@ sx speed 1
|
||||
sx movecount $move_count
|
||||
sx precision 0.01
|
||||
sx part sample
|
||||
sx long_name translate_x
|
||||
|
||||
# Sample Omega, rotate
|
||||
Motor som DMC2280 [params \
|
||||
@@ -390,6 +401,7 @@ som speed 1
|
||||
som movecount $move_count
|
||||
som precision 0.01
|
||||
som part sample
|
||||
som long_name rotate
|
||||
|
||||
# Sample two-theta, detector rotate
|
||||
Motor stth DMC2280 [params \
|
||||
@@ -415,6 +427,7 @@ stth movecount $move_count
|
||||
stth precision 0.01
|
||||
stth blockage_check_interval 2
|
||||
stth part sample
|
||||
stth long_name azimuthal_angle
|
||||
|
||||
############################
|
||||
# Motor Controller 3
|
||||
@@ -459,6 +472,7 @@ Motor ss1r DMC2280 [params \
|
||||
setHomeandRange -motor ss1r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||
ss1r movecount $move_count
|
||||
ss1r part filter
|
||||
ss1r long_name right
|
||||
|
||||
# Slit 1, left
|
||||
Motor ss1l DMC2280 [params \
|
||||
@@ -477,6 +491,7 @@ Motor ss1l DMC2280 [params \
|
||||
setHomeandRange -motor ss1l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||
ss1l movecount $move_count
|
||||
ss1l part filter
|
||||
ss1l long_name left
|
||||
|
||||
# Slit 1, up
|
||||
Motor ss1u DMC2280 [params \
|
||||
@@ -495,6 +510,7 @@ Motor ss1u DMC2280 [params \
|
||||
setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||
ss1u movecount $move_count
|
||||
ss1u part filter
|
||||
ss1u long_name top
|
||||
|
||||
# Slit 1, down
|
||||
Motor ss1d DMC2280 [params \
|
||||
@@ -513,6 +529,7 @@ Motor ss1d DMC2280 [params \
|
||||
setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||
ss1d movecount $move_count
|
||||
ss1d part filter
|
||||
ss1d long_name bottom
|
||||
|
||||
############################
|
||||
# Motor Controller 4
|
||||
@@ -570,6 +587,7 @@ Motor ss2r DMC2280 [params \
|
||||
setHomeandRange -motor ss2r -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||
ss2r movecount $move_count
|
||||
ss2r part filter
|
||||
ss2r long_name right
|
||||
|
||||
# Slit 2, left
|
||||
Motor ss2l DMC2280 [params \
|
||||
@@ -588,6 +606,7 @@ Motor ss2l DMC2280 [params \
|
||||
setHomeandRange -motor ss2l -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange
|
||||
ss2l movecount $move_count
|
||||
ss2l part filter
|
||||
ss2l long_name left
|
||||
|
||||
# Slit 2, up
|
||||
Motor ss2u DMC2280 [params \
|
||||
@@ -606,6 +625,7 @@ Motor ss2u DMC2280 [params \
|
||||
setHomeandRange -motor ss2u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||
ss2u movecount $move_count
|
||||
ss2u part filter
|
||||
ss2u long_name top
|
||||
|
||||
# Slit 2, down
|
||||
Motor ss2d DMC2280 [params \
|
||||
@@ -624,6 +644,7 @@ Motor ss2d DMC2280 [params \
|
||||
setHomeandRange -motor ss2d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
|
||||
ss2d movecount $move_count
|
||||
ss2d part filter
|
||||
ss2d long_name bottom
|
||||
|
||||
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
|
||||
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
|
||||
|
||||
Reference in New Issue
Block a user