Fixed duplication of ss1u for long_name calls.

r1768 | ffr | 2007-04-01 12:25:40 +1000 (Sun, 01 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-01 12:25:40 +10:00
committed by Douglas Clowes
parent 6d673e01dc
commit bb588c7d05
2 changed files with 40 additions and 40 deletions

View File

@@ -6,25 +6,25 @@ slits/1 slits/1/horizontal slits/1/vertical slits/2 slits/2/horizontal slits/2/v
# obj name path
set motor_hpath [list \
ss1u [SplitReply [ss1u long_name]] slits/1/vertical\
ss1d [SplitReply [ss1u long_name]] slits/1/vertical\
ss1l [SplitReply [ss1u long_name]] slits/1/horizontal\
ss1r [SplitReply [ss1u long_name]] slits/1/horizontal\
ss2u [SplitReply [ss1u long_name]] slits/2/vertical\
ss2d [SplitReply [ss1u long_name]] slits/2/vertical\
ss2l [SplitReply [ss1u long_name]] slits/2/horizontal\
ss2r [SplitReply [ss1u long_name]] slits/2/horizontal\
som [SplitReply [ss1u long_name]] sample \
schi [SplitReply [ss1u long_name]] sample \
sphi [SplitReply [ss1u long_name]] sample \
sx [SplitReply [ss1u long_name]] sample \
sy [SplitReply [ss1u long_name]] sample \
stth [SplitReply [ss1u long_name]] sample \
mchi [SplitReply [ss1u long_name]] monochromator \
mom [SplitReply [ss1u long_name]] monochromator \
mphi [SplitReply [ss1u long_name]] monochromator \
mtth [SplitReply [ss1u long_name]] monochromator \
mx [SplitReply [ss1u long_name]] monochromator \
my [SplitReply [ss1u long_name]] monochromator ]
ss1d [SplitReply [ ss1d long_name]] slits/1/vertical\
ss1l [SplitReply [ ss1l long_name]] slits/1/horizontal\
ss1r [SplitReply [ ss1r long_name]] slits/1/horizontal\
ss2u [SplitReply [ ss2u long_name]] slits/2/vertical\
ss2d [SplitReply [ ss2d long_name]] slits/2/vertical\
ss2l [SplitReply [ ss2l long_name]] slits/2/horizontal\
ss2r [SplitReply [ ss2r long_name]] slits/2/horizontal\
som [SplitReply [ som long_name]] sample \
schi [SplitReply [ schi long_name]] sample \
sphi [SplitReply [ sphi long_name]] sample \
sx [SplitReply [ sx long_name]] sample \
sy [SplitReply [ sy long_name]] sample \
stth [SplitReply [ stth long_name]] sample \
mchi [SplitReply [ mchi long_name]] monochromator \
mom [SplitReply [ mom long_name]] monochromator \
mphi [SplitReply [ mphi long_name]] monochromator \
mtth [SplitReply [ mtth long_name]] monochromator \
mx [SplitReply [ mx long_name]] monochromator \
my [SplitReply [ my long_name]] monochromator ]
# Configurable virtual motors
# obj name path master_obj

View File

@@ -6,27 +6,27 @@ slits/1 slits/2 detector detector/monitor detector/histmem ]
# obj name path
set motor_hpath [list \
ss1u [SplitReply [ss1u long_name]] /slits/1 \
ss1d [SplitReply [ss1u long_name]] /slits/1 \
ss1l [SplitReply [ss1u long_name]] /slits/1 \
ss1r [SplitReply [ss1u long_name]] /slits/1 \
ss2u [SplitReply [ss1u long_name]] /slits/2 \
ss2d [SplitReply [ss1u long_name]] /slits/2 \
ss2l [SplitReply [ss1u long_name]] /slits/2 \
ss2r [SplitReply [ss1u long_name]] /slits/2 \
som [SplitReply [ss1u long_name]] /sample \
schi [SplitReply [ss1u long_name]] /sample \
sphi [SplitReply [ss1u long_name]] /sample \
sx [SplitReply [ss1u long_name]] /sample \
sy [SplitReply [ss1u long_name]] /sample \
stth [SplitReply [ss1u long_name]] /sample \
pcx [SplitReply [ss1u long_name]] /monochromator \
pcr [SplitReply [ss1u long_name]] /monochromator \
mom [SplitReply [ss1u long_name]] /monochromator \
mchi [SplitReply [ss1u long_name]] /monochromator \
mphi [SplitReply [ss1u long_name]] /monochromator \
mx [SplitReply [ss1u long_name]] /monochromator \
my [SplitReply [ss1u long_name]] /monochromator \
mtth [SplitReply [ss1u long_name]] /monochromator ]
ss1d [SplitReply [ ss1d long_name]] /slits/1 \
ss1l [SplitReply [ ss1l long_name]] /slits/1 \
ss1r [SplitReply [ ss1r long_name]] /slits/1 \
ss2u [SplitReply [ ss2u long_name]] /slits/2 \
ss2d [SplitReply [ ss2d long_name]] /slits/2 \
ss2l [SplitReply [ ss2l long_name]] /slits/2 \
ss2r [SplitReply [ ss2r long_name]] /slits/2 \
som [SplitReply [ som long_name]] /sample \
schi [SplitReply [ schi long_name]] /sample \
sphi [SplitReply [ sphi long_name]] /sample \
sx [SplitReply [ sx long_name]] /sample \
sy [SplitReply [ sy long_name]] /sample \
stth [SplitReply [ stth long_name]] /sample \
pcx [SplitReply [ pcx long_name]] /monochromator \
pcr [SplitReply [ pcr long_name]] /monochromator \
mom [SplitReply [ mom long_name]] /monochromator \
mchi [SplitReply [ mchi long_name]] /monochromator \
mphi [SplitReply [ mphi long_name]] /monochromator \
mx [SplitReply [ mx long_name]] /monochromator \
my [SplitReply [ my long_name]] /monochromator \
mtth [SplitReply [ mtth long_name]] /monochromator ]
# Configurable virtual motors
# obj name path master_obj