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

@@ -10,30 +10,30 @@ namespace eval optics {
# configuration parameters
# Rows can be of mixed type
array set guide_configuration {
GA {MT A A A A A A A A }
MT {MT MT MT MT MT MT MT MT MT }
LP {MT MT MT MT MT MT MT MT LP }
LENS {MT MT MT MT MT MT MT MT L }
P1 {P A MT MT MT MT MT MT MT }
P1LP {P A MT MT MT MT MT MT LP }
P1LENS {P A MT MT MT MT MT MT L }
G1 {G A MT MT MT MT MT MT MT }
P2 {P G A MT MT MT MT MT MT }
G2 {G G A MT MT MT MT MT MT }
P3 {P G G A MT MT MT MT MT }
G3 {G G G A MT MT MT MT MT }
P4 {P G G G A MT MT MT MT }
G4 {G G G G A MT MT MT MT }
P5 {P G G G G A MT MT MT }
G5 {G G G G G A MT MT MT }
P6 {P G G G G G A MT MT }
G6 {G G G G G G A MT MT }
P7 {P G G G G G G A MT }
G7 {G G G G G G G A MT }
P8 {P G G G G G G G A }
G8 {G G G G G G G G A }
P9 {P G G G G G G G G }
G9 {G G G G G G G G G }
ga {MT A A A A A A A A }
mt {MT MT MT MT MT MT MT MT MT }
lp {MT MT MT MT MT MT MT MT LP }
lens {MT MT MT MT MT MT MT MT L }
p1 {P A MT MT MT MT MT MT MT }
p1lp {P A MT MT MT MT MT MT LP }
p1lens {P A MT MT MT MT MT MT L }
g1 {G A MT MT MT MT MT MT MT }
p2 {P G A MT MT MT MT MT MT }
g2 {G G A MT MT MT MT MT MT }
p3 {P G G A MT MT MT MT MT }
g3 {G G G A MT MT MT MT MT }
p4 {P G G G A MT MT MT MT }
g4 {G G G G A MT MT MT MT }
p5 {P G G G G A MT MT MT }
g5 {G G G G G A MT MT MT }
p6 {P G G G G G A MT MT }
g6 {G G G G G G A MT MT }
p7 {P G G G G G G A MT }
g7 {G G G G G G G A MT }
p8 {P G G G G G G G A }
g8 {G G G G G G G G A }
p9 {P G G G G G G G G }
g9 {G G G G G G G G G }
}
# This list maps the motor names to columns of the
@@ -49,32 +49,3 @@ namespace eval optics {
variable guide_configuration_columns
namespace export set_guide
}
##
# @brief set_guide uses a lookup table to setup the collimation system
# @param row, selects a row from the guide configuration table
#
# eg\n
# set_guide HIRES
proc ::optics::set_guide {row} {
variable guide_configuration
variable guide_configuration_columns
array set c1_map {G 1 MT 2 P 3}
array set c2_map {MT 1 G 2 A 3}
array set c3_map {MT 1 G 2 A 3}
array set c4_map {MT 1 G 2 A 3}
array set c5_map {MT 1 G 2 A 3}
array set c6_map {MT 1 G 2 A 3}
array set c7_map {MT 1 G 2 A 3}
array set c8_map {MT 1 G 2 A 3}
array set c9_map {LP 1 MT 2 G 3 A 4 L 5}
foreach el $guide_configuration($row) guide $guide_configuration_columns {
lappend to_config $guide
lappend to_config [set ${guide}_map($el)]
}
eval "drive $to_config"
}
namespace import ::optics::set_guide
publish set_guide user