hipadaba_configuration_common.tcl

Oops calling the deleted hlistplainprop function instead of the new hlistprop.

sans/config/commands/commands.tcl
Set beamstop diameter (BSdiam) when selecting a beamstop

sans optics/aperture_configuration.tcl
The entrance app is 50mm when guide config is g1 to g9 or p1 to p9

sans parameters.tcl
Added GuideConfig parameter to record the last configuration set by SICS.

r2870 | ffr | 2010-01-15 18:19:22 +1100 (Fri, 15 Jan 2010) | 12 lines
This commit is contained in:
Ferdi Franceschini
2010-01-15 18:19:22 +11:00
committed by Douglas Clowes
parent 59101a7d4d
commit 724af2d4ca
4 changed files with 54 additions and 39 deletions

View File

@@ -48,15 +48,22 @@ proc ::optics::AttRotLookup {angle} {
proc ::optics::EApLookUp {angle param} {
variable EApLookupTable
set foundit false
if [ catch {
if {$param == "size"} {
set cgf [SplitReply [GuideConfig]]
if {[string first $cgf "g1 g2 g3 g4 g5 g6 g7 g8 g9 p1 p2 p3 p4 p5 p6 p7 p8 p9"] != -1} {
return 50
}
}
switch $param {
"size" {set index 0}
"shape" {set index 1}
default {
error "ERROR: Invalid lookup parameter $param"
}
}
}
foreach vangle [array names EApLookupTable] {
if {$vangle == [expr int($angle)]} {
set foundit true