Change filter "type" for slits to "aperture" and add grouping information.

r1788 | ffr | 2007-04-02 18:22:56 +1000 (Mon, 02 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-02 18:22:56 +10:00
committed by Douglas Clowes
parent f338cf5b4e
commit b250273deb

View File

@@ -1,7 +1,7 @@
# $Revision: 1.9 $ # $Revision: 1.10 $
# $Date: 2007-04-02 05:00:03 $ # $Date: 2007-04-02 08:22:56 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $ # Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION # START MOTOR CONFIGURATION
@@ -487,8 +487,8 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange ss1r softupperlim $ss1r_HiRange
ss1r home 0 ss1r home 0
ss1r movecount $move_count ss1r movecount $move_count
ss1r part sample ss1r part aperture.first
ss1r long_name right ss1r long_name right
# Slit 1, left # Slit 1, left
Motor ss1l DMC2280 [params \ Motor ss1l DMC2280 [params \
@@ -508,8 +508,8 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange ss1l softupperlim $ss1l_HiRange
ss1l home 0 ss1l home 0
ss1l movecount $move_count ss1l movecount $move_count
ss1l part sample ss1l part aperture.first
ss1l long_name left ss1l long_name left
# Slit 1, up # Slit 1, up
Motor ss1u DMC2280 [params \ Motor ss1u DMC2280 [params \
@@ -529,8 +529,8 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange ss1u softupperlim $ss1u_HiRange
ss1u home 0 ss1u home 0
ss1u movecount $move_count ss1u movecount $move_count
ss1u part sample ss1u part aperture.first
ss1u long_name top ss1u long_name top
# Slit 1, down # Slit 1, down
Motor ss1d DMC2280 [params \ Motor ss1d DMC2280 [params \
@@ -550,8 +550,8 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange ss1d softupperlim $ss1d_HiRange
ss1d home 0 ss1d home 0
ss1d movecount $move_count ss1d movecount $move_count
ss1d part sample ss1d part aperture.first
ss1d long_name bottom ss1d long_name bottom
############################ ############################
# Motor Controller 4 # Motor Controller 4
@@ -578,8 +578,8 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange ss2r softupperlim $ss2r_HiRange
ss2r home 0 ss2r home 0
ss2r movecount $move_count ss2r movecount $move_count
ss2r part sample ss2r part aperture.second
ss2r long_name right ss2r long_name right
# Slit 2, left # Slit 2, left
Motor ss2l DMC2280 [params \ Motor ss2l DMC2280 [params \
@@ -599,8 +599,8 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange ss2l softupperlim $ss2l_HiRange
ss2l home 0 ss2l home 0
ss2l movecount $move_count ss2l movecount $move_count
ss2l part sample ss2l part aperture.second
ss2l long_name left ss2l long_name left
# Slit 2, up # Slit 2, up
Motor ss2u DMC2280 [params \ Motor ss2u DMC2280 [params \
@@ -620,8 +620,8 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange ss2u softupperlim $ss2u_HiRange
ss2u home 0 ss2u home 0
ss2u movecount $move_count ss2u movecount $move_count
ss2u part sample ss2u part aperture.second
ss2u long_name top ss2u long_name top
# Slit 2, down # Slit 2, down
Motor ss2d DMC2280 [params \ Motor ss2d DMC2280 [params \
@@ -641,8 +641,8 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange ss2d softupperlim $ss2d_HiRange
ss2d home 0 ss2d home 0
ss2d movecount $move_count ss2d movecount $move_count
ss2d part sample ss2d part aperture.second
ss2d long_name bottom ss2d long_name bottom
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]]"}