Remove superfluous trailing white space from TCL files
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
#TODO Get rid of duplication in bmonscan and hmscan code
|
||||
|
||||
namespace eval scan {
|
||||
variable ic_runscanpar
|
||||
variable ic_runscanpar
|
||||
|
||||
variable ic_hmm_datatype
|
||||
variable save_filetype
|
||||
@@ -132,7 +132,7 @@ proc ::scan::ic_initialize {} {
|
||||
hmscan function prepare ::scan::hmm_scan_prepare
|
||||
hmscan function finish ::scan::hmm_scan_finish
|
||||
|
||||
# TODO Use ic_runscanpar to create the ::scan::runscan command and
|
||||
# TODO Use ic_runscanpar to create the ::scan::runscan command and
|
||||
# to validate the "runscan" proc parameters.
|
||||
array set ic_runscanpar [subst {
|
||||
scanvar text=drivable
|
||||
@@ -143,7 +143,7 @@ proc ::scan::ic_initialize {} {
|
||||
preset float=0,inf
|
||||
datatype text=[join [array names ::nexus::histmem_filetype_spec] , ]
|
||||
savetype text=save,nosave
|
||||
force boolean
|
||||
force boolean
|
||||
}]
|
||||
scriptcallback connect hmscan SCANEND ::scan::hmscanend_event
|
||||
scriptcallback connect bmonscan SCANEND ::scan::bmonscanend_event
|
||||
@@ -178,7 +178,7 @@ proc ::scan::check_limit {scan_variable limit_name target} {
|
||||
#
|
||||
# NOTE: The sics scan object alread checks if a variable is drivable
|
||||
# so we don't have to.
|
||||
# TODO We can't check limits of virtual motors yet because the
|
||||
# TODO We can't check limits of virtual motors yet because the
|
||||
# configurablevirtualmotor doesn't set a checklimits function.
|
||||
proc ::scan::check_scanvar {sobj uobj} {
|
||||
variable check_thread0
|
||||
@@ -216,7 +216,7 @@ proc ::scan::check_scanvar {sobj uobj} {
|
||||
# Returning an error will cause the scan to abort before it starts\n
|
||||
# eg\n
|
||||
# return -code error "error message"
|
||||
proc ::scan::pre_hmm_scan_prepare {} {}
|
||||
proc ::scan::pre_hmm_scan_prepare {} {}
|
||||
|
||||
##
|
||||
# @brief Do some pre-scan checks and prime the DAE
|
||||
@@ -294,7 +294,7 @@ proc ::scan::hmm_scan_finish {sobj uobj} {
|
||||
# and clear any data links
|
||||
::nexus::newfile clear data
|
||||
if {$reset_position == "true"} {
|
||||
# set reset_position "false"
|
||||
# set reset_position "false"
|
||||
foreach svar $scanvarlist initpos $scaninitposlist {
|
||||
set svtype [getatt $svar type]
|
||||
if {$svtype == "motor" || $svtype == "configurablevirtualmotor"} {
|
||||
@@ -339,7 +339,7 @@ proc ::scan::bm_writepoint {sobj uobj pt} {
|
||||
|
||||
#TODO Feedback for Histogram memory scan
|
||||
proc ::scan::hmm_writepoint {sobj uobj pt} {
|
||||
variable save_filetype
|
||||
variable save_filetype
|
||||
# Write hdb tree
|
||||
::nexus::save $pt
|
||||
}
|
||||
@@ -348,10 +348,10 @@ proc ::scan::donothing {args} {}
|
||||
|
||||
proc ::scan::bm_count {sobj uobj point mode preset} {
|
||||
::scan::hdb_bmonscan -set mode $mode
|
||||
::scan::hdb_bmonscan -set preset $preset
|
||||
::scan::hdb_bmonscan -set feedback scanpoint $point;
|
||||
::scan::hdb_bmonscan -set feedback mode $mode;
|
||||
::scan::hdb_bmonscan -set feedback preset $preset;
|
||||
::scan::hdb_bmonscan -set preset $preset
|
||||
::scan::hdb_bmonscan -set feedback scanpoint $point;
|
||||
::scan::hdb_bmonscan -set feedback mode $mode;
|
||||
::scan::hdb_bmonscan -set feedback preset $preset;
|
||||
::scan::hdb_bmonscan -set feedback scan_variable_value [SplitReply [[lindex $::scan::scanvarlist 0]]]
|
||||
::monitor::count $mode $preset
|
||||
}
|
||||
@@ -396,7 +396,7 @@ proc ::scan::bm_scan_prepare {sobj uobj} {
|
||||
|
||||
::scan::hdb_bmonscan -set feedback status BUSY
|
||||
run_mode "bmonscan"
|
||||
|
||||
|
||||
array set bm_fb [::scan::hdb_bmonscan -list feedback]
|
||||
set ::histogram_memory::histmem_axes(SVAR) [SplitReply [sicslist [lindex $::scan::scanvarlist 0] hdb_path] ]
|
||||
::nexus::newfile BEAM_MONITOR $save_filetype
|
||||
@@ -480,7 +480,7 @@ namespace eval scan {
|
||||
switch $arg {
|
||||
"force" {
|
||||
if [string is boolean $val] {
|
||||
set force_scan $val
|
||||
set force_scan $val
|
||||
} else {
|
||||
error "ERROR: force must be true or false"
|
||||
}
|
||||
@@ -512,7 +512,7 @@ namespace eval scan {
|
||||
# hmscan ignores mode and preset, we use FAT_COUNT_METHOD and FAT_COUNT_STOP
|
||||
::histogram_memory::count_method $mode
|
||||
::histogram_memory::count_size $preset
|
||||
hmscan clear
|
||||
hmscan clear
|
||||
foreach scanvar $scanvarlist start $startlist step $steplist {
|
||||
hmscan add $scanvar $start $step
|
||||
}
|
||||
@@ -523,7 +523,7 @@ namespace eval scan {
|
||||
"monitor" { set bms_mode "monitor" }
|
||||
default {return -code error "ERROR: mode should be 'time' or 'monitor' not $mode"}
|
||||
}
|
||||
bmonscan clear
|
||||
bmonscan clear
|
||||
foreach scanvar $scanvarlist start $startlist step $steplist {
|
||||
bmonscan add $scanvar $start $step
|
||||
}
|
||||
@@ -560,7 +560,7 @@ namespace eval scan {
|
||||
# Default filetype for histogram memory scans
|
||||
set ic_hmm_datatype "HISTOGRAM_XYT"
|
||||
# Default save uniquely numbered files
|
||||
set savetype "save"
|
||||
set savetype "save"
|
||||
set reset_position [SplitReply [::scan::runscan_reset_position]]
|
||||
|
||||
checkarg $scanvar varname "Expecting a scan variable name, not $scanvar"
|
||||
@@ -568,7 +568,7 @@ namespace eval scan {
|
||||
checkarg $step double "Expecing a float for $scanvar step value, not $step"
|
||||
lappend scanvarlist $scanvar
|
||||
lappend startlist $start
|
||||
lappend steplist $step
|
||||
lappend steplist $step
|
||||
for {set argindex 0} {1} {incr argindex 3} {
|
||||
set par [lindex $args $argindex]
|
||||
if {[string length $par] == 0} {
|
||||
@@ -613,7 +613,7 @@ namespace eval scan {
|
||||
return $message
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#TODO Add counter (monitor_1 monitor_2 ... histmem) and filetype BEAM_MONITOR HISTMEM_?
|
||||
##
|
||||
# @brief Run a histogram memory scan
|
||||
@@ -639,11 +639,11 @@ namespace eval scan {
|
||||
set force_scan false
|
||||
|
||||
set hm_ft_names [array names ::nexus::histmem_filetype_spec]
|
||||
|
||||
|
||||
# Default filetype for histogram memory scans
|
||||
set ic_hmm_datatype "HISTOGRAM_XYT"
|
||||
# Default save uniquely numbered files
|
||||
set savetype "save"
|
||||
set savetype "save"
|
||||
set reset_position [SplitReply [::scan::runscan_reset_position]]
|
||||
if {[is_drivable $scanvar] == 0} {
|
||||
error "The scan variable <$scanvar> must be drivable"
|
||||
@@ -673,7 +673,7 @@ namespace eval scan {
|
||||
switch $arg {
|
||||
"force" {
|
||||
if [string is boolean $val] {
|
||||
set force_scan $val
|
||||
set force_scan $val
|
||||
} else {
|
||||
error "ERROR: force must be true or false"
|
||||
}
|
||||
@@ -705,7 +705,7 @@ namespace eval scan {
|
||||
# hmscan ignores mode and preset, we use FAT_COUNT_METHOD and FAT_COUNT_STOP
|
||||
::histogram_memory::count_method $mode
|
||||
::histogram_memory::count_size $preset
|
||||
hmscan clear
|
||||
hmscan clear
|
||||
hmscan add $scanvar $start $step
|
||||
} elseif {$det_type == "bmon"} {
|
||||
set mode [string tolower $mode]
|
||||
@@ -714,7 +714,7 @@ namespace eval scan {
|
||||
"monitor" { set bms_mode "monitor" }
|
||||
default {return -code error "ERROR: mode should be 'time' or 'monitor' not $mode"}
|
||||
}
|
||||
bmonscan clear
|
||||
bmonscan clear
|
||||
bmonscan add $scanvar $start $step
|
||||
} else {
|
||||
return -code error "ERROR: detector type should be 'histmem' or 'bmon' not $det_type"
|
||||
@@ -744,6 +744,6 @@ namespace eval scan {
|
||||
}
|
||||
namespace import ::scan::runscan
|
||||
namespace import ::scan::mscan
|
||||
publish runscan user
|
||||
publish runscan user
|
||||
publish mscan user
|
||||
sicslist setatt runscan privilege internal
|
||||
|
||||
Reference in New Issue
Block a user