Merged RELEASE-1_1 back into trunk.

r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-06 19:10:02 +10:00
committed by Douglas Clowes
parent 79ac59740f
commit e7324b8335
21 changed files with 1828 additions and 63 deletions

View File

@@ -1,7 +1,7 @@
# $Revision: 1.12 $
# $Date: 2007-04-02 05:00:20 $
# $Revision: 1.13 $
# $Date: 2007-04-06 09:10:02 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $
# Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION
@@ -486,7 +486,7 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
ss1r movecount $move_count
ss1r part filter
ss1r part aperture.first
ss1r long_name right
# Slit 1, left
@@ -507,7 +507,7 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
ss1l movecount $move_count
ss1l part filter
ss1l part aperture.first
ss1l long_name left
# Slit 1, up
@@ -528,7 +528,7 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
ss1u movecount $move_count
ss1u part filter
ss1u part aperture.first
ss1u long_name top
# Slit 1, down
@@ -549,7 +549,7 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
ss1d movecount $move_count
ss1d part filter
ss1d part aperture.first
ss1d long_name bottom
############################
@@ -609,7 +609,7 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
ss2r movecount $move_count
ss2r part filter
ss2r part aperture.second
ss2r long_name right
# Slit 2, left
@@ -630,7 +630,7 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
ss2l movecount $move_count
ss2l part filter
ss2l part aperture.second
ss2l long_name left
# Slit 2, up
@@ -651,7 +651,7 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
ss2u movecount $move_count
ss2u part filter
ss2u part aperture.second
ss2u long_name top
# Slit 2, down
@@ -672,7 +672,7 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
ss2d movecount $move_count
ss2d part filter
ss2d part aperture.second
ss2d long_name bottom
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}