Remove superfluous trailing white space from TCL files
This commit is contained in:
@@ -40,7 +40,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
|
||||
set tbb1 [expr $tbb0 + $tbinwidth_ns / $clock_scale]
|
||||
OAT_TABLE -set X { 199.5 198.5 } NXC $xbins Y { -0.5 15.5 } NYC $ybins T "$tbb0 $tbb1" NTC $tbins
|
||||
|
||||
# Use the ::histogram_memory::clock_scale function to make sure that the value in the
|
||||
# Use the ::histogram_memory::clock_scale function to make sure that the value in the
|
||||
# time of flight channel width is consistent with its units
|
||||
sicslist setatt tofw units [::histogram_memory::clock_scale units]
|
||||
tofw [expr ($tbb1 - $tbb0) * [::histogram_memory::clock_scale]]
|
||||
@@ -65,7 +65,7 @@ return {
|
||||
</MESYTEC_MPSD8_CHANNEL_GAINS>
|
||||
<MESYTEC_MPSD8_THRESHOLDS>
|
||||
30 30 30 30 30 30 30 30
|
||||
30 30 30 30 30 30 30 30
|
||||
30 30 30 30 30 30 30 30
|
||||
30 30 30 30 30 30 30 30
|
||||
30 20 10 10 10 10 10 10
|
||||
</MESYTEC_MPSD8_THRESHOLDS>
|
||||
@@ -178,7 +178,7 @@ proc ::histogram_memory::isc_initialize {} {
|
||||
::histogram_memory::ic_initialize
|
||||
::histogram_memory::set_graphtype "two_theta" "boundaries"
|
||||
|
||||
# Width = 25mm spacing * 200 tubes = 5000mm (120 degree coverage)
|
||||
# Width = 25mm spacing * 200 tubes = 5000mm (120 degree coverage)
|
||||
# Height = 1015mm (tube length)
|
||||
# Radius = 2400mm
|
||||
detector_active_height_mm 1015
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
###########################################################################################################################
|
||||
# @file Proptocols between SICS and High Voltage Controller
|
||||
# @file Proptocols between SICS and High Voltage Controller
|
||||
#
|
||||
# This is a driver for SICS to make following communication with the High Voltage Controller
|
||||
#
|
||||
#
|
||||
# 1. SICS uses TCP/IP protocol to interact with the HV component who shall provide an IP address
|
||||
# 1. SICS uses TCP/IP protocol to interact with the HV component who shall provide an IP address
|
||||
# together with an port number.
|
||||
#
|
||||
# 2. Commands From SICS to HV component,
|
||||
# 2. Commands From SICS to HV component,
|
||||
# 1. HV_START hv1=xxx, i1=xxx, hv2=xxx, i2=xxx
|
||||
# :: Responses from HV component back to SICS are either
|
||||
# OK (if the system start correctly), or
|
||||
# Error Message (if the system does not start normally, the error message shall indicate
|
||||
# Error Message (if the system does not start normally, the error message shall indicate
|
||||
# type of the errors)
|
||||
#
|
||||
# 2. HV_STOP (This will stop/shutdown the HV component totally)
|
||||
@@ -22,10 +22,10 @@
|
||||
# Error Message (if the system does not start normally, the error message will indicate type of the errors)
|
||||
#
|
||||
# 4. HV_STATUS (This command will send to HV component automatically and regularly, i.e. every 1 sec)
|
||||
# :: Responses from HV component back to SICS is "hv1=xxx, i1=xxx, hv2=xxx, i2=xxx, system=rampingup;\n",
|
||||
# :: Responses from HV component back to SICS is "hv1=xxx, i1=xxx, hv2=xxx, i2=xxx, system=rampingup;\n",
|
||||
# SICS uses this information to update their values in the SICS system and on the Gumtree client as well.
|
||||
#
|
||||
# 3. HV parameters to be dsiaplyed on the Gumtree GUI are, hv1, i1, hv2, i2, system
|
||||
# 3. HV parameters to be dsiaplyed on the Gumtree GUI are, hv1, i1, hv2, i2, system
|
||||
#
|
||||
# Author: Jing Chen (jgn@ansto.gov.au) July 2011
|
||||
#
|
||||
@@ -33,7 +33,7 @@
|
||||
# ::scobj::hv::mkHV {
|
||||
# name "hv"
|
||||
# IP localhost
|
||||
# PORT 55010
|
||||
# PORT 55010
|
||||
# tuning 1
|
||||
# interval 1
|
||||
#
|
||||
@@ -92,7 +92,7 @@ proc ::scobj::hv:setting {field basePath} {
|
||||
}
|
||||
default {error "ERROR: illegal input command, type help for more info"
|
||||
return idle
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sct send $comm
|
||||
@@ -115,7 +115,7 @@ proc ::scobj::hv::getHVStatusFunc {mode} {
|
||||
"config" {set comm "get config\r\n"}
|
||||
default {error "ERROR: illegal input command, type help for more info"
|
||||
return idle
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sct send $comm
|
||||
@@ -153,7 +153,7 @@ proc ::scobj::hv::rdHVStatusFunc {basePath mode} {
|
||||
hsetprop $basePath/status/DetectorLowPressure units [lindex $replyText 17]
|
||||
|
||||
hset $basePath/status/SampleLowPressure [lindex $replyText 19]
|
||||
hsetprop $basePath/status/SampleLowPressure units [lindex $replyText 20]
|
||||
hsetprop $basePath/status/SampleLowPressure units [lindex $replyText 20]
|
||||
|
||||
hset $basePath/status/pressure5 [lindex $replyText 22]
|
||||
hsetprop $basePath/status/pressure5 units [lindex $replyText 23]
|
||||
@@ -174,7 +174,7 @@ proc ::scobj::hv::rdHVStatusFunc {basePath mode} {
|
||||
[lindex $replyText 4] [lindex $replyText 3]"
|
||||
|
||||
if {[string equal [hval $basePath/dataRecording] "ON"] == 1} {
|
||||
debug_log $logdata
|
||||
debug_log $logdata
|
||||
}
|
||||
|
||||
} elseif {$mode == "config"} {
|
||||
@@ -202,14 +202,14 @@ proc ::scobj::hv::rdHVStatusFunc {basePath mode} {
|
||||
|
||||
##
|
||||
# @brief Make a HV Controller
|
||||
#
|
||||
# @param argList, {name "hv" IP localhost PORT 65123 tuning 1 interval 1}
|
||||
#
|
||||
# @param argList, {name "hv" IP localhost PORT 65123 tuning 1 interval 1}
|
||||
#
|
||||
# name: name of hv 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::hv::mkHV {argList} {
|
||||
# Generate parameter array from the argument list
|
||||
@@ -222,7 +222,7 @@ proc ::scobj::hv::mkHV {argList} {
|
||||
sicslist setatt $pa(NAME) klass instrument
|
||||
sicslist setatt $pa(NAME) long_name $pa(NAME)
|
||||
|
||||
set hvPath /sics/$pa(NAME)
|
||||
set hvPath /sics/$pa(NAME)
|
||||
|
||||
foreach {hPath type priv datatype init } {
|
||||
msg plain user text UNKNOW
|
||||
@@ -236,7 +236,7 @@ proc ::scobj::hv::mkHV {argList} {
|
||||
status/SampleLowPressure plain user float 0
|
||||
status/pressure5 plain user float 0
|
||||
status/pressure6 plain user float 0
|
||||
|
||||
|
||||
status/state plain user text UNKNOW
|
||||
status/PLC-S plain user text UNKNOW
|
||||
status/PLC-H plain user text UNKNOW
|
||||
@@ -254,9 +254,9 @@ proc ::scobj::hv::mkHV {argList} {
|
||||
hset $hvPath/$hPath $init
|
||||
}
|
||||
|
||||
hsetprop $hvPath/status oldval UNKNOWN
|
||||
hsetprop $hvPath/status oldval UNKNOWN
|
||||
hsetprop $hvPath/config oldval UNKNOWN
|
||||
|
||||
|
||||
#makesctcontroller sct_hv rfamp $pa(IP):$pa(PORT)
|
||||
makesctcontroller sct_hv std $pa(IP):$pa(PORT)
|
||||
|
||||
@@ -400,7 +400,7 @@ proc set_data_record {args} {
|
||||
"on" {hset /instrument/hv/dataRecording "ON"}
|
||||
"OFF" {hset /instrument/hv/dataRecording "OFF"}
|
||||
"off" {hset /instrument/hv/dataRecording "OFF"}
|
||||
default {error "ERROR: please enter 'on' or 'off' to set the switch"}
|
||||
default {error "ERROR: please enter 'on' or 'off' to set the switch"}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user