linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove superfluous trailing white space from TCL files

Browse Source
This commit is contained in:
Douglas Clowes
2014-05-16 12:30:51 +10:00
parent 89e4e37f9e
commit 92d3acb5d5
230 changed files with 1835 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/sans/config/anticollider/anticollider.tcl
View File

@@ -1,6 +1,6 @@
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
source $cfPath(anticollider)/anticollider_common.tcl
source $cfPath(anticollider)/anticollider_common.tcl
# NOTE: This is called with a list of motorname target pairs
proc ::anticollider::enable {args} {

38
site_ansto/instrument/sans/config/beamline/sct_flipper.tcl
View File

@@ -14,7 +14,7 @@
# tuning 1
# currtol 1
# interval 2
# }
# }
#
# NOTE:
# If tuning=1 this will generate flipper/set_current and flipper/set_frequency
@@ -31,7 +31,7 @@
# voltage increases to 34 Vem and the current decreases;
# " switch off the RF output;
# " decrease current setting by rotating the potentiometer 10 turns counter-clockwise;
# " verify the vacuum level in the tank and restart the flipper operation only if it is below 0.01 mbar.
# " verify the vacuum level in the tank and restart the flipper operation only if it is below 0.01 mbar.
namespace eval ::scobj::rfgen {
# Control states
@@ -118,7 +118,7 @@ proc ::scobj::rfgen::set_current {basePath} {
variable RAMPSTART
set newCurr [sct target]
set current [expr {round(10.0 * $newCurr)}]
hsetprop $basePath targetCurr $current
hsetprop $basePath opCurr $current
@@ -135,7 +135,7 @@ proc ::scobj::rfgen::set_frequency {basePath} {
variable RAMPSTART
set newFreq [sct target]
hsetprop $basePath targetFreq $newFreq
hsetprop $basePath opFreq $newFreq
hsetprop $basePath ramping $RAMPSTART
@@ -185,11 +185,11 @@ proc ::scobj::rfgen::rdStatFunc {} {
set statList [join $temp]
mkStatArr stateArr $statList
if {$statList != [sct oldStateRep]} {
if {$statList != [sct oldStateRep]} {
hset $basePath/flip_current [expr {$stateArr(curr) / 10.0}]
hset $basePath/flip_frequency $stateArr(freq)
hset $basePath/flip_voltage $stateArr(voltage)
hset $basePath/flip_on $stateArr(O)
hset $basePath/flip_frequency $stateArr(freq)
hset $basePath/flip_voltage $stateArr(voltage)
hset $basePath/flip_on $stateArr(O)
hset $basePath/state_report $statList
sct update $statList
sct utime readtime
@@ -208,10 +208,10 @@ proc ::scobj::rfgen::rdStatFunc {} {
##
# @brief State transition function
proc ::scobj::rfgen::stateFunc {} {
variable RAMPIDLE
variable RAMPSTOP
variable RAMPIDLE
variable RAMPSTOP
variable RAMPSTART
variable RAMPBUSY
variable RAMPBUSY
variable RAMPTOZERO
variable FLIPOFF
variable MAXVOLTAGE
@@ -222,7 +222,7 @@ proc ::scobj::rfgen::stateFunc {} {
mkStatArr stateArr [hval $basePath/state_report]
set currControlStatus [sct status]
switch $currSuperState [ subst -nocommands {
$RAMPSTART {
# broadcast RAMPSTART
@@ -320,8 +320,8 @@ proc ::scobj::rfgen::rampFunc {} {
##
# @brief Make a spin flipper control object
#
# @param argList, {name "flipper" address "1" opCurr 68 opFreq 241 IP localhost PORT 65123 tuning 0 interval 1}
#
# @param argList, {name "flipper" address "1" opCurr 68 opFreq 241 IP localhost PORT 65123 tuning 0 interval 1}
#
# name: name of spin flipper object
# address: address assigned to RF generator 1-9
@@ -352,7 +352,7 @@ proc ::scobj::rfgen::mkFlipper {argList} {
hfactory /sics/$pa(NAME)/flip_voltage plain internal int
hfactory /sics/$pa(NAME)/flip_on plain internal int
hsetprop /sics/$pa(NAME) read ::scobj::rfgen::rqStatFunc
hsetprop /sics/$pa(NAME) read ::scobj::rfgen::rqStatFunc
hsetprop /sics/$pa(NAME) rdState ::scobj::rfgen::rdStatFunc
hsetprop /sics/$pa(NAME) stateChange ::scobj::rfgen::stateFunc
hsetprop /sics/$pa(NAME) ramp ::scobj::rfgen::rampFunc
@@ -391,12 +391,12 @@ proc ::scobj::rfgen::mkFlipper {argList} {
if {[SplitReply [rfgen_simulation]] == "false"} {
makesctcontroller sct_rfgen rfamp $pa(IP):$pa(PORT)
mkStatArr stateArr [split [sct_rfgen transact "L:$pa(ADDRESS)"] "|="]
hset /sics/$pa(NAME)/flip_current [expr {$stateArr(curr) / 10.0}]
hset /sics/$pa(NAME)/flip_frequency $stateArr(freq)
hset /sics/$pa(NAME)/flip_voltage $stateArr(voltage)
hset /sics/$pa(NAME)/flip_frequency $stateArr(freq)
hset /sics/$pa(NAME)/flip_voltage $stateArr(voltage)
hset /sics/$pa(NAME)/flip_on $stateArr(O)
hsetprop /sics/$pa(NAME) targetFreq $stateArr(freq)
hsetprop /sics/$pa(NAME) targetFreq $stateArr(freq)
hsetprop /sics/$pa(NAME) targetCurr [expr {$stateArr(curr) / 10.0}]
sct_rfgen poll /sics/$pa(NAME) $pa(INTERVAL)

14
site_ansto/instrument/sans/config/commands/commands.tcl
View File

@@ -22,20 +22,20 @@ namespace eval motor {
# (Xbbs, Zbbs) = beam pos in beamstop coords
# (Xdf,Zdf) = detector pos in frame coords
# (Xbsf,Zbsf) = beamstop pos in frame coords
#
#
# (Xbf,Zbf) = (Xdf+Xbd, Zdf+Zbd) = (Xbsf+Xbbs, Zbsf+Zbbs)
# Origin of detector coords = frame origin
#
#
# Detector and beamstop motor readings with beamstop disk centers
# overlapping over detector center mark.
# Xdf = 264.542 (7283813) Zdf = 0
# Xbbs = 296.291 (8054270)
# Zbbs = 259.641 (13488244)
# Xbd = dethw, Zbd = (dethh)
#
#
# 264.542+dethw = Xbsf+296.291
# 0+dethh = Zbsf+259.641
#
#
# Xbsf = -31.749 + dethw, Zbsf = -259.641 + dethh
proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
set bsdriving false
@@ -153,7 +153,7 @@ 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
}
@@ -180,7 +180,7 @@ namespace eval optics {
# @param row, selects a row from the guide configuration table
#
# eg\n
# guide ga
# guide ga
command guide "
text=[join [array names ::optics::guide_configuration] , ] configuration
" {
@@ -193,7 +193,7 @@ namespace eval optics {
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)]
lappend to_config [set ::optics::${guide}_map($el)]
}
::optics::guide -set feedback status BUSY
set msg [eval "drive $to_config"]

2
site_ansto/instrument/sans/config/counter/counter.tcl
View File

@@ -5,7 +5,7 @@ namespace eval counter {
variable isc_numchannels
variable isc_monitor_address
variable isc_portlist
variable isc_beam_monitor_list
variable isc_beam_monitor_list
proc set_sobj_attributes {} {
}
}

8
site_ansto/instrument/sans/config/environment/environment.tcl
View File

@@ -35,14 +35,14 @@ switch [string tolower $envtemp] {
puts "Configuring RHQC"
# 9600 8 1 None None Enable
add_sct_ls340 tc1 137.157.202.78 4001 "\r" 0.5 5.0
# TODO Set controlsensor
# TODO Set controlsensor
# if { [SplitReply [environment_simulation]] == "false"} {
# tc1 controlsensor sensorB
# }
# puts "Added tc1 with [tc1 controlsensor]"
# 9600 8 1 None None Enable
add_sct_ls340 tc2 137.157.202.78 4002 "\r" 0.5 5.0
# TODO Set controlsensor
# TODO Set controlsensor
# if { [SplitReply [environment_simulation]] == "false"} {
# tc2 controlsensor sensorD
# }
@@ -58,7 +58,7 @@ switch [string tolower $envtemp] {
sicslist setatt temperature long_name temperature
sicslist setatt temperature klass sample
sicslist setatt temperature units K
# TODO Set controlsensor
# TODO Set controlsensor
# tc1 controlsensor sensorA
}
#add_ips120 ips120 137.157.202.78 4004 0.001
@@ -125,7 +125,7 @@ switch [string tolower $envtemp] {
sicslist setatt temperature long_name temperature
sicslist setatt temperature klass sample
sicslist setatt temperature units K
# TODO Set controlsensor
# TODO Set controlsensor
# tc1 controlsensor sensorA
}
add_ips120 ips120 137.157.202.78 4004 0.001

4
site_ansto/instrument/sans/config/environment/temperature/lakeshore340.tcl
View File

@@ -14,7 +14,7 @@ source $cfPath(environment)/temperature/lakeshore340_common.tcl
# @param settle, settling time in seconds
# @param range, lakeshore range
# @param upperlimit, upper temperature limit Kelvin
# @param lowerlimit, lower temperature limit Kelvin
# @param lowerlimit, lower temperature limit Kelvin
proc ::environment::temperature::add_ls340 {tcn tc_dfltURL mport args} {
variable tc_dfltPar
variable moxaPortMap
@@ -41,7 +41,7 @@ proc ::environment::temperature::add_ls340 {tcn tc_dfltURL mport args} {
}
}
sicslist setatt $tcn environment_name ${tcn}_cntrl
sicslist setatt $tcn environment_name ${tcn}_cntrl
sicslist setatt $tcn long_name control_sensor_reading
::environment::mkenvinfo $tcn {heateron {priv user} range {priv manager} }
} message ] {

26
site_ansto/instrument/sans/config/goniometer/sct_goniometer.tcl
View File

@@ -1,5 +1,5 @@
##
# @file Goniometer controller
# @file Goniometer controller
#
# Author: Jing Chen (jgn@ansto.gov.au) June 2010
#
@@ -10,7 +10,7 @@
# PORT 62944
# tuning 1
# interval 1
# }
# }
#
# NOTE:
# If tuning=1 this will generate gom/set_gom, gchi/set_gchi and gphi/set_gphi
@@ -25,14 +25,14 @@ proc ::scobj::goniometer::set_gom {basePath} {
set newGOM [sct target]
hsetprop $basePath targetGom $newGOM
return idle
}
}
proc ::scobj::goniometer::set_gchi {basePath} {
set newGCHI [sct target]
hsetprop $basePath targetGchi $newGCHI
return idle
}
}
proc ::scobj::goniometer::set_gphi {basePath} {
set newGPHI [sct target]
hsetprop $basePath targetGphi $newGPHI
@@ -63,12 +63,12 @@ proc ::scobj::goniometer::rdStatFunc {basePath} {
hset $basePath/gom $stateArr(gom)
hset $basePath/gchi $stateArr(gchi)
hset $basePath/gphi $stateArr(gphi)
hset $basePath/gphi $stateArr(gphi)
hsetprop $basePath currGom $stateArr(gom)
hsetprop $basePath currGchi $stateArr(gchi)
hsetprop $basePath currGphi $stateArr(gphi)
#sct update $s3
sct utime readtime
}
@@ -110,21 +110,21 @@ proc ::scobj::goniometer::checkReplyFunc {} {
broadcast "ERROR: PLC cannot write new values for variable due to internal reason!"
} else {
sct utime readtime
}
}
return idle
}
##
# @brief Make a Goniometer controller
#
# @param argList, {name "goniometer" IP localhost PORT 62944 tuning 1 interval 1}
#
# @param argList, {name "goniometer" IP localhost PORT 62944 tuning 1 interval 1}
#
# name: name of goniometer controller object
# IP: IP address of RF generator moxa box
# PORT: Port number assigned to the generator on the moxa-box
# tuning: boolean, set tuning=1 to allow instrument scientists to set the axe positions
# interval: polling and ramping interval in seconds.
# interval: polling and ramping interval in seconds.
proc ::scobj::goniometer::mkGoniometer {argList} {
# Generate parameter array from the argument list
foreach {k v} $argList {

2
site_ansto/instrument/sans/config/hipadaba/hpaths.tcl
View File

@@ -1,4 +1,4 @@
set hpaths [list experiment ]
set hpaths [list experiment ]
# Maps devices (eg motors) to hipadaba paths.
# obj name path

4
site_ansto/instrument/sans/config/hmm/detector_ordela.tcl
View File

@@ -38,7 +38,7 @@ proc ord_set_pot { potxy potnumber potvalue } {
set rsp [ sct_dhv transact "p $potname $potvalue" ]
# MJL sometimes the driver returns absolute bollocks, looks like strings from inside the TCL interpreter.
# Under this condition, assume the write failed, although we can't really tell without reading back value, but don't bother.
# Just flag anything that's not 'ACK' as 'Bad' i.e. do retries.
# Just flag anything that's not 'ACK' as 'Bad' i.e. do retries.
# clientput "Response:" $rsp
if { $rsp != "ACK" } { set rsp "Bad" }
}
@@ -401,7 +401,7 @@ proc ord_calc_hist_mmm_xy { } {
set span_y 190
set histogram_mean_x [expr double($histogram_mean_x) / double($span_x) ]
set histogram_mean_y [expr double($histogram_mean_y) / double($span_y) ]
clientput "Calculated histogram means: mx =" $histogram_mean_x "and my =" $histogram_mean_y "(should be
clientput "Calculated histogram means: mx =" $histogram_mean_x "and my =" $histogram_mean_y "(should be
roughly equal if bs window is square)."
}
Publish ord_calc_hist_mmm_xy User

4
site_ansto/instrument/sans/config/hmm/hmm_configuration.tcl
View File

@@ -4,7 +4,7 @@ set sim_mode [SplitReply [hmm_simulation]]
proc ::histogram_memory::init_OAT_TABLE {} {
if [ catch {
# We don't need a MAX_CHAN parameter for time because the time channel
# We don't need a MAX_CHAN parameter for time because the time channel
# is scaled by calling the ::histogram_memory::clock_scale function
OAT_TABLE X -setdata MAX_CHAN 192
OAT_TABLE Y -setdata MAX_CHAN 192
@@ -19,7 +19,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
hmm configure fat_frame_frequency $freq
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { 191.5 190.5 } NXC 192 Y { -0.5 0.5 } NYC 192 T { 0 20000 } NTC 1
OAT_TABLE -set X { 191.5 190.5 } NXC 192 Y { -0.5 0.5 } NYC 192 T { 0 20000 } NTC 1
} message ] {
return -code error $message
}

8
site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl
View File

@@ -20,10 +20,10 @@ set 20sample_table {
6 203.7
7 161.7
8 119.7
9 77.7
10 35.7
11 -46.3
12 -88.3
9 77.7
10 35.7
11 -46.3
12 -88.3
13 -130.3
14 -172.3
15 -214.3

24
site_ansto/instrument/sans/config/optics/aperture_configuration.tcl
View File

@@ -1,17 +1,17 @@
namespace eval optics {
array set AttRotLookupTable {
0 { 0.0 1 }
30 { 1.3 0.498782 }
60 { 3.3 0.176433 }
90 { 4.9 0.0761367 }
120 { 6.4 0.0353985 }
150 { 8.3 0.0137137 }
180 { 9.6 0.00614167 }
210 {11.2 0.00264554 }
240 {13.1 0.000994504 }
270 {15.0 0.000358897 }
300 {18.0 7.2845e-05 }
330 {25.0 1.67827e-06 }
0 { 0.0 1 }
30 { 1.3 0.498782 }
60 { 3.3 0.176433 }
90 { 4.9 0.0761367 }
120 { 6.4 0.0353985 }
150 { 8.3 0.0137137 }
180 { 9.6 0.00614167 }
210 {11.2 0.00264554 }
240 {13.1 0.000994504 }
270 {15.0 0.000358897 }
300 {18.0 7.2845e-05 }
330 {25.0 1.67827e-06 }
}
array set EApLookupTable {

56
site_ansto/instrument/sans/config/optics/guide_configuration.tcl
View File

@@ -1,5 +1,5 @@
##
# @file
# @file
# A guide configuration table where each line describes the setup
# for a mode of operation.
# The table will have a corresponding interpretation list which provides
@@ -7,7 +7,7 @@
namespace eval optics {
##
# @brief These arrays map the component identifiers (G, MT, etc) to the
# @brief These arrays map the component identifiers (G, MT, etc) to the
# position index for each guide motor (c1, c2 ... c9)
array set c1_map {G 1 MT 2 P 3}
array set c2_map {MT 1 G 2 A 3}
@@ -20,43 +20,43 @@ namespace eval optics {
array set c9_map {L 1 MT 2 G 3 A 4 LP 5}
# The guide configuration table is indexed by a configuration
# identifier (ga, mt, lp, etc). Each row has two elements,
# identifier (ga, mt, lp, etc). Each row has two elements,
# 1. A list of components selected for each guide (MT A ... etc)
# 2. The entrance aperature position in mm
# Eg $guide_configuration(p2) returns the following list
# {{P G A A A A A A A } 6934}
# {{P G A A A A A A A } 6934}
array set guide_configuration {
ga {{MT A A A A A A A A } 675}
ga {{MT A A A A A A A A } 675}
mt {{MT MT MT MT MT MT MT MT MT} 675}
lp {{MT MT MT MT MT MT MT MT LP} 675}
lens {{MT A A A A A A A L } 675}
p1 {{P A MT MT MT MT MT MT MT} 4621}
p1lp {{P A MT MT MT MT MT MT LP} 4621}
p1lens {{P A MT MT MT MT MT MT L } 4621}
g1 {{G A A A A A A A A } 4929}
p2 {{P G A A A A A A A } 6934}
g2 {{G G A A A A A A A } 6934}
p3 {{P G G A A A A A A } 8949}
g3 {{G G G A A A A A A } 8949}
p4 {{P G G G A A A A A } 10955}
g4 {{G G G G A A A A A } 10955}
p5 {{P G G G G A A A A } 12943}
g5 {{G G G G G A A A A } 12943}
p6 {{P G G G G G A A A } 14970}
g6 {{G G G G G G A A A } 14970}
p7 {{P G G G G G G A A } 16971}
g7 {{G G G G G G G A A } 16971}
p8 {{P G G G G G G G A } 18937}
g8 {{G G G G G G G G A } 18937}
p9 {{P G G G G G G G G } 19925}
g9 {{G G G G G G G G G } 19925}
lp {{MT MT MT MT MT MT MT MT LP} 675}
lens {{MT A A A A A A A L } 675}
p1 {{P A MT MT MT MT MT MT MT} 4621}
p1lp {{P A MT MT MT MT MT MT LP} 4621}
p1lens {{P A MT MT MT MT MT MT L } 4621}
g1 {{G A A A A A A A A } 4929}
p2 {{P G A A A A A A A } 6934}
g2 {{G G A A A A A A A } 6934}
p3 {{P G G A A A A A A } 8949}
g3 {{G G G A A A A A A } 8949}
p4 {{P G G G A A A A A } 10955}
g4 {{G G G G A A A A A } 10955}
p5 {{P G G G G A A A A } 12943}
g5 {{G G G G G A A A A } 12943}
p6 {{P G G G G G A A A } 14970}
g6 {{G G G G G G A A A } 14970}
p7 {{P G G G G G G A A } 16971}
g7 {{G G G G G G G A A } 16971}
p8 {{P G G G G G G G A } 18937}
g8 {{G G G G G G G G A } 18937}
p9 {{P G G G G G G G G } 19925}
g9 {{G G G G G G G G G } 19925}
}
# This list maps the motor names to columns of the
# guide_configuration table.
set guide_configuration_columns {
c1 c2 c3 c4 c5 c6 c7 c8 c9
}
}
}

12
site_ansto/instrument/sans/config/parameters/parameters.tcl
View File

@@ -1,4 +1,4 @@
# TODO Make readonly getset macro for AttFactor
# TODO Make readonly getset macro for AttFactor
##
# @file The velocity selector position is used as the reference for other instrument
@@ -112,7 +112,7 @@ namespace eval parameters {
set paramlist {
AttFactor
BSdiam
DetPosYOffset
DetPosYOffset
EApPosY
EApShape
EApX
@@ -121,8 +121,8 @@ namespace eval parameters {
L1
L2
Plex
SamYOffset
Transmission
SamYOffset
Transmission
}
}
##
@@ -144,9 +144,9 @@ proc ::parameters::missingparams {} {
}
##
# @brief Check list
# @brief Check list
proc check {args} {
switch $args {
switch $args {
"missing" {
::parameters::missingparams
}

2
site_ansto/instrument/sans/config/plc/plc.tcl
View File

@@ -1,5 +1,5 @@
set sim_mode [SplitReply [plc_simulation]]
if {$sim_mode == "false"} {
if {$sim_mode == "false"} {
MakeAsyncQueue plc_chan SafetyPLC 137.157.211.22 30001
MakeSafetyPLC plc plc_chan 0
}

28
site_ansto/instrument/sans/config/velsel/sct_velsel.tcl
View File

@@ -44,7 +44,7 @@ namespace eval ::scobj::velocity_selector {
proc AngleSpeedToWavelength {angle VsVarSpeed {velsel 0}} {
variable nvs40Par
variable nvs43Par
variable nvs43Par
variable velsel_ID
if {$velsel == 40} {
@@ -78,7 +78,7 @@ namespace eval ::scobj::velocity_selector {
set lambda0 [expr ($m_dTwistAngle*60.0*$VNeutron)/(360.0*$m_dLength*$m_iMaxSpeed)]
set pi [expr acos(-1)]
# set pi = 3.14159265358979;
set A [expr (2.0 * $rBeamCenter * $pi) / (60.0 * $VNeutron)]
set angle_rad [expr ($angle * $pi) / 180.0]
set lambda1 [expr ( tan($angle_rad)+($A * $m_iMaxSpeed * $lambda0) ) / ((-($A*$A) * $m_iMaxSpeed * $VsVarSpeed * $lambda0 * tan($angle_rad) )+($A * $VsVarSpeed))]
@@ -88,7 +88,7 @@ namespace eval ::scobj::velocity_selector {
proc WavelengthToSpeed {angle lambda1 {velsel 0}} {
variable nvs40Par
variable nvs43Par
variable nvs43Par
variable velsel_ID
if {$velsel == 40} {
@@ -122,7 +122,7 @@ namespace eval ::scobj::velocity_selector {
set lambda0 [expr ($m_dTwistAngle*60.0*$VNeutron)/(360.0*$m_dLength*$m_iMaxSpeed)]
set pi [expr acos(-1)]
# set pi = 3.14159265358979;
set A [expr (2.0 * $rBeamCenter * $pi) / (60.0 * $VNeutron)]
set angle_rad [expr ($angle * $pi) / 180.0]
set VsVarSpeed [expr ( tan($angle_rad)+($A * $m_iMaxSpeed * $lambda0) ) / ((-($A*$A) * $m_iMaxSpeed * $lambda1 * $lambda0 * tan($angle_rad) )+($A * $lambda1))]
@@ -281,7 +281,7 @@ proc rdPwdAck {} {
proc setSpeed {vs_root statuspath nextState} {
variable paramindex
set speed [format "%5d" [sct target]]
set speed [format "%5d" [sct target]]
sct send "N#SOS#SPEED $speed"
set angle [lindex [hval $statuspath] $paramindex(ttang) end]
@@ -300,7 +300,7 @@ proc rdPwdAck {} {
}
proc sendCommand {nextState} {
set state [string tolower [sct target]]
set state [string tolower [sct target]]
switch $state {
"idle" {
sct send "N#SOS#IDLE "
@@ -392,12 +392,12 @@ proc get_nearest_allowed_speed {speed} {
##
# @brief This will check if the requested speed is allowed
proc checkBlockedSpeeds {statuspath} {
proc checkBlockedSpeeds {statuspath} {
variable paramindex
set speed [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} {
if {$ttang > 90} {
error "ERROR: You must first initialise the turntable"
}
@@ -411,7 +411,7 @@ proc checkBlockedWavelengths {statuspath} {
set lambda [sct target]
set ttang [lindex [hval $statuspath] $paramindex(ttang) end]
if {$ttang > 90} {
if {$ttang > 90} {
error "ERROR: You must first initialise the turntable"
}
set angle [lindex [hval $statuspath] $paramindex(ttang) end]
@@ -457,7 +457,7 @@ proc halt {root} {
set angle [lindex [hval $statuspath] $paramindex(ttang) end]
set speed [WavelengthToSpeed $angle $lambda]
set fmtspeed [format "%5d" $speed]
set fmtspeed [format "%5d" $speed]
sct send "N#SOS#SPEED $fmtspeed"
sct target $lambda
hsetprop $vs_root/setspeed target $fmtspeed
@@ -497,7 +497,7 @@ proc halt {root} {
hsetprop $velselPath/status values busy,idle
hfactory $velselPath/device_error plain spy text
hset $velselPath/device_error ""
# Must be set by user
hfactory $velselPath/wavelength plain user float
hsetprop $velselPath/wavelength permlink data_set
@@ -512,7 +512,7 @@ proc halt {root} {
hfactory $velselPath/geometry/position/VelSelPosZ plain user float
hsetprop $velselPath/geometry/position/VelSelPosZ units "mm"
hfactory $velselPath/geometry/position/VelSelCoordScheme plain user text
# Setup nodes for state report parameters
foreach par [lsort [array names paramindex]] {
hfactory $velselPath/$par plain spy $paramtype($par)
@@ -635,7 +635,7 @@ proc halt {root} {
hset $velselPath/geometry/position/VelSelPosY 0.0
hset $velselPath/geometry/position/VelSelPosZ 0.0
hset $velselPath/geometry/position/VelSelCoordScheme "Cartesian"
proc sct_velsel_init {velselPath } {
@@ -658,7 +658,7 @@ proc halt {root} {
makesctcontroller sct_velsel astvelsel $velsel_IP:$velsel_port "" 10
sct_velsel poll $statusPath $pollrate
}
namespace export AngleSpeedToWavelength
namespace export AngleSpeedToWavelength
namespace export WavelengthToSpeed
}
namespace import ::scobj::velocity_selector::AngleSpeedToWavelength

4
site_ansto/instrument/sans/quokka_configuration.tcl
View File

@@ -1,8 +1,8 @@
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Required by server_config.tcl
# Required by server_config.tcl
VarMake Instrument Text Internal
Instrument quokka
Instrument quokka
Instrument lock
#START SERVER CONFIGURATION SECTION