Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-05-30 10:26:57 +10:00
committed by Douglas Clowes
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions

View File

@@ -1,7 +1,7 @@
# $Revision: 1.15 $
# $Date: 2008-02-19 04:27:19 $
# $Revision: 1.16 $
# $Date: 2008-05-30 00:26:57 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $
# Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION
@@ -959,39 +959,3 @@ make_coll_motor_1 c8 section_8 pc9 $vc_units
make_coll_motor_1 c9 section_9 pc10 $vc_units
unset vc_units
namespace eval guide {
VarMake ::guide::select::section text user
VarMake ::guide::polarizer::in text user
VarMake ::guide::lens::selection text user
#TODO Set aperture size variable.
command select {int:0,1,2,3,4,5,6,7,8,9 section} {
set empty {2 1 1 1 1 1 1 1 2}
set aperture {2 3 3 3 3 3 3 3 4}
set guide {1 2 2 2 2 2 2 2 3}
array set lens {left 1 right 5 none 2}
set target $empty
if {$section > 0} {
set gr [lrange $guide 0 [expr $section -1]]
set er [lrange $empty $section 8]
set target [list $gr $er]
if {[SplitReply [::guide::polarizer::in]] == "yes"} {
lset target 0 3
}
} else {
lset target 8 $lens([SplitReply [::guide::lens::selection]])
}
set fh [open junk.txt w]
for {set i 1} {$i <= 9} {incr i} {
puts $fh "run vc0$i [lindex target [expr {$i-1}]]"
}
close $fh
}
command polarizer {text:yes,no in} {
::guide::polarizer::in $in
}
command lens {text:left,right,none selection} {
::guide::lens::selection $selection
}
}