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

74
site_ansto/instrument/reflectometer/config/commands/commands.tcl
View File

@@ -26,7 +26,7 @@ namespace eval beam {
::beam::attenuator -addfb text BeamAttenuator
namespace eval exp_mode {
variable valid_modes
variable valid_modes
variable guide_for_mode ;#guide element for a specific mode
variable c1ht_pos
#0=polarisation
@@ -37,9 +37,9 @@ namespace eval exp_mode {
variable c1ht_pos
set valid_modes [list SB DB FOC MT POL POLANAL]
set c1ht_pos [list 1057 806.7 557.1 320 68.9 68.9]
command set_mode "text=[join $valid_modes ,] arg " { ;#need to change all softzero's
global ::exp_mode::valid_modes
global ::exp_mode::valid_modes
if {[lsearch $::exp_mode::valid_modes $arg] == -1} {
Clientput "Mode is: $::exp_mode::valid_modes - (POL, POLANAL, MT, FOC, DB, SB)"
return -code error "Mode is: $::exp_mode::valid_modes - (polarisation, polarisation and analysis, mt,focussing,DB,single)"
@@ -54,17 +54,17 @@ namespace eval exp_mode {
twotheta -1
return -code ok
}
proc ::exp_mode::omega_2theta { arg1 arg2 {s1vg 0} {s2vg 0} {s3vg 0} {s4vg 0}} {
#need to set omega first. This is because
#for Single bounce the twotheta positions depend on the angle of incidence
# whenever omega_2theta is called, or the mode is changed, the slits should close
# this is to save the detector from being overloaded.
# the following line does the job. However, it is duplicated when the mode is set in
# the following line does the job. However, it is duplicated when the mode is set in
# set_omega, so it is commented out for now.
# drive ss1u 0 ss1d 0 ss2u 0 ss2d 0 ss3u 0 ss3d 0 ss4u 0 ss4d 0
# drive ss1u 0 ss1d 0 ss2u 0 ss2d 0 ss3u 0 ss3d 0 ss4u 0 ss4d 0
# if {[catch {::exp_mode::set_omega $arg1} errMsg]} {return -code error $errMsg}
# if {[catch {::exp_mode::set_two_theta $arg2} errMsg]} {return -code error $errMsg}
@@ -72,21 +72,21 @@ proc ::exp_mode::omega_2theta { arg1 arg2 {s1vg 0} {s2vg 0} {s3vg 0} {s4vg 0}} {
twotheta $arg2
if {![string is double $arg1] || ![string is double $arg2]} {
return -code error "omega and two theta should be a proper number"
}
}
statemon start om2th
if {[catch {
::exp_mode::set_omega $arg1
::exp_mode::set_two_theta $arg2
} errMsg ] } {
omega -1
twotheta -1
twotheta -1
broadcast ERROR: omega_2theta command did not complete correctly
broadcast $errMsg
broadcast $errMsg
return -code error $errMsg
}
if {![string is double $s1vg] || ![string is double $s2vg] || ![string is double $s3vg] || ![string is double $s4vg]} {
return -code error "ERROR: all the slit openings need to be numbers"
}
}
drive ss1u [expr 0.5 * $s1vg] ss1d [expr -0.5 * $s1vg] ss2u [expr 0.5 * $s2vg] ss2d [expr -0.5 * $s2vg] ss3u [expr 0.5 * $s3vg] ss3d [expr -0.5 * $s3vg] ss4u [expr 0.5 * $s4vg] ss4d [expr -0.5*$s4vg]
statemon stop om2th
return -code ok
@@ -102,7 +102,7 @@ proc ::exp_mode::set_guide_element { arg } {
global ::exp_mode::c1ht_pos
global ::exp_mode::valid_modes
drive ss1u 0 ss1d 0 ss2u 0 ss2d 0 ss3u 0 ss3d 0 ss4u 0 ss4d 0
drive ss1u 0 ss1d 0 ss2u 0 ss2d 0 ss3u 0 ss3d 0 ss4u 0 ss4d 0
if {[lsearch $::exp_mode::valid_modes $arg] == -1} {
Clientput "Mode is: $::exp_mode::valid_modes - (polarisation, polarisation and analysis, mt, focussing, DB, single)"
return -code error "Mode is: $::exp_mode::valid_modes - (polarisation,polarisation and analysis, mt, focussing, DB, single)"
@@ -112,9 +112,9 @@ proc ::exp_mode::set_guide_element { arg } {
return -code error $errMsg
} else {
guide_element $arg
return -code ok
return -code ok
}
}
}
proc ::exp_mode::set_omega { arg } {
set expmode [SplitReply [mode]]
@@ -154,17 +154,17 @@ proc ::exp_mode::set_omega { arg } {
;#offset is the vertical drop from the beam centre onto the middle of the second compound mirror
;# each compound mirror is 600mm long
;# therefore the distance between the place where the beam hits the centre of both mirrors is
;# 2 * 300 * cos(1.2) = 599.868
;# 2 * 300 * cos(1.2) = 599.868
;# guide2_distance is therefore the distance from the midpoint of the second compound mirror to chopper disc 1.
;# i.e. sample-> midpoint of compound mirror2 = 1546 + 300*cos3.6 = 1845.4
set offset [expr 599.868*sin($temp)]
set offset [expr 599.868*sin($temp)]
set arg 4.8 ;#fixed angle
set d1 [expr [SplitReply [slit3_distance]] - [SplitReply [guide2_distance]]]
set d2 [expr [SplitReply [sample_distance]] - [SplitReply [guide2_distance]]]
set h1 [expr -1. * $d1 * tan($argrad) - $offset]
set h1 [expr -1. * $d1 * tan($argrad) - $offset]
set h2 [expr -1. * $d2 * tan($argrad) - $offset]
if { [catch {checkMotionAndDrive st3vt $h1} errMsg]} {return -code error $errMsg}
@@ -208,20 +208,20 @@ proc ::exp_mode::set_omega { arg } {
drive sth $arg st3vt 0
}
default {
return -code error "omega driving not specified for that mode"
return -code error "omega driving not specified for that mode"
}
}
return -code ok
}
publish ::exp_mode::set_omega user
proc ::exp_mode::set_two_theta { arg } {
set expmode [SplitReply [mode]]
set expomega [SplitReply [omega]]
if {[lsearch $::exp_mode::valid_modes $expmode] == -1} {
return -code error "please set the mode and omega first"
return -code error "please set the mode and omega first"
}
if {$expomega == "NaN"} {
return -code error "please set omega first"
@@ -248,14 +248,14 @@ proc ::exp_mode::set_two_theta { arg } {
set h3 [expr -1. * $d4 * tan($omegarad)]
set b [expr $d3 / cos($omegarad)]
set c [expr $d3 / cos($argrad-$omegarad)]
set h4 [expr sqrt(pow($b,2) + pow($c,2) - 2*$b*$c*cos($argrad))]
set h4 [expr sqrt(pow($b,2) + pow($c,2) - 2*$b*$c*cos($argrad))]
if { [catch {isszst4vtsafe st4vt [expr $h2 + $h1]} errMsg]} {return -code error $errMsg}
if { [catch {checkMotionAndDrive st4vt [expr $h2 + $h1]} errMsg]} {return -code error $errMsg}
if { [catch {checkMotionAndDrive dz [expr $h3 + $h4]} errMsg]} {return -code error $errMsg}
}
DB { ;#checked ARJN 081231
set temp [deg2rad 2.4]
set offset [expr 599.868*sin($temp)]
set offset [expr 599.868*sin($temp)]
set expomega 4.8
set omegarad [deg2rad $expomega]
@@ -272,7 +272,7 @@ proc ::exp_mode::set_two_theta { arg } {
set h3 [expr -1. * $d4 * tan($omegarad) - $offset]
set b [expr $d3 / cos($omegarad)]
set c [expr $d3 / cos($argrad-$omegarad)]
set h4 [expr sqrt(pow($b,2) + pow($c,2) - 2*$b*$c*cos($argrad))]
set h4 [expr sqrt(pow($b,2) + pow($c,2) - 2*$b*$c*cos($argrad))]
if { [catch {isszst4vtsafe st4vt [expr $h2 + $h1]} errMsg]} {return -code error $errMsg}
if { [catch {checkMotionAndDrive st4vt [expr $h2 + $h1]} errMsg]} {return -code error $errMsg}
if { [catch {checkMotionAndDrive dz [expr $h3 + $h4]} errMsg]} {return -code error $errMsg}
@@ -288,7 +288,7 @@ proc ::exp_mode::set_two_theta { arg } {
checkMotion dz $h1
} errMsg]} {
return -code error $errMsg
}
}
drive st4vt $h2 dz $h1
}
MT {
@@ -302,7 +302,7 @@ proc ::exp_mode::set_two_theta { arg } {
checkMotion dz $h1
} errMsg ] } {
return -code error $errMsg
}
}
drive st4vt $h2 dz $h1
}
POL {
@@ -316,7 +316,7 @@ proc ::exp_mode::set_two_theta { arg } {
checkMotion dz $h1
} errMsg ] } {
return -code error $errMsg
}
}
drive st4vt $h2 dz $h1 analz -200 analtilt 0
}
POLANAL {
@@ -335,7 +335,7 @@ proc ::exp_mode::set_two_theta { arg } {
checkMotion analtilt $ang1
} errMsg ] } {
return -code error $errMsg
}
}
drive st4vt $h2 dz $h1 analz $h3 analtilt $ang1
}
default {
@@ -350,14 +350,14 @@ proc ::exp_mode::checkMotion { scan_variable target } {
set motor_list [sicslist type motor]
if {[lsearch $motor_list $scan_variable]==-1} {
return -code error "you tried to drive a motor that doesn't exist"
return -code error "you tried to drive a motor that doesn't exist"
}
set softzero [SplitReply [$scan_variable softzero]]
set absoluteTarget [expr $softzero+$target]
if { [catch {isszst4vtsafe $scan_variable $target} errMsg]} {return -code error $errMsg}
if {[catch {
if {[catch {
::scan::check_limit $scan_variable hardlowerlim $absoluteTarget
::scan::check_limit $scan_variable hardupperlim $absoluteTarget
::scan::check_limit $scan_variable softlowerlim $target
@@ -373,22 +373,22 @@ proc ::exp_mode::checkMotionAndDrive { scan_variable target } {
set motor_list [sicslist type motor]
#lappend motorlist [sicslist type configurablevirtualmotor]
set precision [SplitReply [$scan_variable precision]]
set precision [SplitReply [$scan_variable precision]]
if {[catch {
if {[catch {
::exp_mode::checkMotion $scan_variable $target
}]} {
return -code error $::errorInfo
} else {
drive $scan_variable $target
set position [SplitReply [$scan_variable]]
set position [SplitReply [$scan_variable]]
if {[expr [expr $position-$target] > abs($precision)]} {
return -code error "move of: $scan_variable did not reach required precision"
} else {
Clientput "New $scan_variable Position: $position"
Clientput "Driving finished successfully"
}
return -code ok
return -code ok
}
}
publish ::exp_mode::checkMotionAndDrive user
@@ -409,7 +409,7 @@ proc ::exp_mode::isszst4vtsafe { scan_variable target } {
st4vt {
set st4vtPosition [expr $target + $st4vtsoftzero]
}
}
}
set distance [expr $szHardUpperLim - $szPosition + $st4vtPosition ]
if { $distance < 98. } {
return -code error "You would have a collision between st4vt and sz if you tried to move $scan_variable to $target"