r3097 | jgn | 2011-04-08 16:05:02 +1000 (Fri, 08 Apr 2011) | 1 line
This commit is contained in:
committed by
Douglas Clowes
parent
bda5f46596
commit
a9f7812e47
@@ -11,29 +11,30 @@ namespace eval motor {
|
||||
# }
|
||||
#}
|
||||
|
||||
namespace eval beamstops {
|
||||
command selbsn {int=1,2,3,4,5,6 bs} {
|
||||
selbs $bs "UNDEF" "UNDEF"
|
||||
}
|
||||
command selbsxz {int=1,2,3,4,5,6 bs float bx float bz} {
|
||||
selbs $bs $bx $bz
|
||||
}
|
||||
}
|
||||
|
||||
namespace eval optics {
|
||||
VarMake ::optics::select::section text user
|
||||
VarMake ::optics::polarizer::in text user
|
||||
VarMake ::optics::lens::selection text user
|
||||
#namespace eval beamstops {
|
||||
# command selbsn {int=1,2,3,4,5,6 bs} {
|
||||
# selbs $bs "UNDEF" "UNDEF"
|
||||
# }
|
||||
# command selbsxz {int=1,2,3,4,5,6 bs float bx float bz} {
|
||||
# selbs $bs $bx $bz
|
||||
# }
|
||||
#}
|
||||
|
||||
#namespace eval optics {
|
||||
# VarMake ::optics::select::section text user
|
||||
# VarMake ::optics::polarizer::in text user
|
||||
# VarMake ::optics::lens::selection text user
|
||||
|
||||
command rotary_attenuator {int=0,15,45,90,180 angle} {
|
||||
drive att $angle
|
||||
}
|
||||
# command rotary_attenuator {int=0,15,45,90,180 angle} {
|
||||
# drive att $angle
|
||||
# }
|
||||
|
||||
command entrance_aperture {
|
||||
int=0,45,90,135,180,270 angle
|
||||
} {
|
||||
drive srce $angle
|
||||
}
|
||||
# command entrance_aperture {
|
||||
# int=0,45,90,135,180,270 angle
|
||||
# } {
|
||||
# drive srce $angle
|
||||
# }
|
||||
|
||||
# TODO Do we need this
|
||||
# command sample_aperture {
|
||||
@@ -45,6 +46,43 @@ namespace eval optics {
|
||||
# SApShape $shape
|
||||
# }
|
||||
|
||||
##############################
|
||||
##
|
||||
# @brief The "guide" command uses a lookup table to setup the collimation system
|
||||
# @param row, selects a row from the guide configuration table
|
||||
#
|
||||
# eg\n
|
||||
# guide ga
|
||||
# command guide "
|
||||
# text=[join [array names ::optics::guide_configuration] , ] configuration
|
||||
# " {
|
||||
#
|
||||
# variable guide_configuration
|
||||
# variable guide_configuration_columns
|
||||
#
|
||||
# if [ catch {
|
||||
#
|
||||
# foreach {compselection position} $guide_configuration($configuration) {
|
||||
# foreach el $compselection guide $guide_configuration_columns {
|
||||
# lappend to_config $guide
|
||||
# lappend to_config [set ::optics::${guide}_map($el)]
|
||||
# }
|
||||
# ::optics::guide -set feedback status BUSY
|
||||
# set msg [eval "drive $to_config"]
|
||||
# EApPosY $position
|
||||
# }
|
||||
# GuideConfig $configuration
|
||||
# } message ] {
|
||||
# ::optics::guide -set feedback status IDLE
|
||||
# if {$::errorCode=="NONE"} {return $message}
|
||||
# return -code error $message
|
||||
# }
|
||||
# ::optics::guide -set feedback status IDLE
|
||||
# }
|
||||
# ::optics::guide -addfb text status
|
||||
# ::optics::guide -set feedback status IDLE
|
||||
#}
|
||||
|
||||
|
||||
proc ::commands::isc_initialize {} {
|
||||
::commands::ic_initialize
|
||||
|
||||
Reference in New Issue
Block a user