Remove superfluous trailing white space from TCL files
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
|
||||
source $cfPath(anticollider)/anticollider_common.tcl
|
||||
source $cfPath(anticollider)/anticollider_common.tcl
|
||||
::anticollider::loadscript acscript.txt
|
||||
|
||||
@@ -34,7 +34,7 @@ command SimpleRun {
|
||||
float=0:inf steptime
|
||||
int=1:inf numsteps
|
||||
} {
|
||||
|
||||
|
||||
# RadCollOff
|
||||
histmem mode time
|
||||
histmem preset $steptime
|
||||
@@ -68,7 +68,7 @@ command RadCollRun {
|
||||
int=1:inf oscno
|
||||
int=1:inf reps
|
||||
} {
|
||||
|
||||
|
||||
# RadCollOn $oscno
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XY
|
||||
@@ -102,7 +102,7 @@ float=0:inf time
|
||||
}
|
||||
RadCollOff
|
||||
}
|
||||
# RadCollScan
|
||||
# RadCollScan
|
||||
command RadCollScan {
|
||||
text=drivable motor
|
||||
float start
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
|
||||
|
||||
# Euler cradle scan commands for texture runs
|
||||
# AJS Dec 2010
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
proc SetHistoSync {framenum} {
|
||||
histmem stop
|
||||
bat_table -set NO_BAT_ENTRIES $framenum NO_BAT_PERIODS $framenum
|
||||
bat_table -set NO_BAT_ENTRIES $framenum NO_BAT_PERIODS $framenum
|
||||
bat_table -set NO_REPEAT_ENTRY 1 NO_REPEAT_TABLE 1 NO_EXECUTE_TABLE 1 PERIOD_INDICES { 0 1 }
|
||||
fat_table -set NOS_PERIODS $framenum
|
||||
oat_table -set T {0 2200000} NTC 1
|
||||
@@ -22,7 +22,7 @@ publish SetHistoSync user
|
||||
|
||||
proc SetHistoNormal {} {
|
||||
histmem stop
|
||||
bat_table -set NO_BAT_ENTRIES 1 NO_BAT_PERIODS 1
|
||||
bat_table -set NO_BAT_ENTRIES 1 NO_BAT_PERIODS 1
|
||||
bat_table -set NO_REPEAT_ENTRY 0 NO_REPEAT_TABLE 0 NO_EXECUTE_TABLE 0 PERIOD_INDICES { 0}
|
||||
fat_table -set NOS_PERIODS 1
|
||||
oat_table -set T {0 2200000} NTC 1
|
||||
@@ -32,7 +32,7 @@ proc SetHistoNormal {} {
|
||||
}
|
||||
|
||||
# continous scan for EPHI- the euler cradle phi stage (innermost axis)
|
||||
# note make sure controller 2 has the PHISCAN code in it
|
||||
# note make sure controller 2 has the PHISCAN code in it
|
||||
|
||||
publish SetHistoNormal user
|
||||
|
||||
@@ -77,7 +77,7 @@ broadcast $scval $stval
|
||||
|
||||
|
||||
# this we needed when it didn't work properly
|
||||
# proc ::histogram_memory::pre_count {} {}
|
||||
# proc ::histogram_memory::pre_count {} {}
|
||||
# ephi send SHC
|
||||
# ephi send SPC=25000
|
||||
# ephi send BCG
|
||||
|
||||
@@ -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 {} {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 ] {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set hpaths [list experiment detector detector/monitor detector/histmem ]
|
||||
set hpaths [list experiment detector detector/monitor detector/histmem ]
|
||||
|
||||
# Maps devices (eg motors) to hipadaba paths.
|
||||
# obj name path
|
||||
|
||||
@@ -10,7 +10,7 @@ proc ::histogram_memory::init_OAT_TABLE {args} {
|
||||
} else {
|
||||
set resolution "hires"
|
||||
}
|
||||
# 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 3872
|
||||
OAT_TABLE X -setdata MAX_CHAN_PERSEG 992
|
||||
@@ -64,7 +64,7 @@ proc ::histogram_memory::oat_bins {axis} {
|
||||
set bb0 3871.5
|
||||
set bb1 [expr $bb0+$bstep]
|
||||
FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP [expr abs(32.0/$bstep)]
|
||||
}
|
||||
}
|
||||
return [list $bb0 $bb1]
|
||||
} else {
|
||||
return [OAT_TABLE -get $axis]
|
||||
@@ -78,7 +78,7 @@ proc ::histogram_memory::oat_bins {axis} {
|
||||
# @brief Returns the current number of channels for a given axis.
|
||||
proc ::histogram_memory::number_of_channels {axis} {
|
||||
array set channID {X NXC Y NYC T NTC}
|
||||
if [ catch {
|
||||
if [ catch {
|
||||
if {$axis == "X"} {
|
||||
set nch_perseg [OAT_TABLE -get $channID($axis)]
|
||||
set overlap [FAT_TABLE -get MULTI_HOST_HISTO_STITCH_OVERLAP]
|
||||
|
||||
@@ -122,7 +122,7 @@ proc histmem_acquire_period_sequence { Np Nf } {
|
||||
histmem start
|
||||
|
||||
set dlytime [ expr int( 1000 * $Nf / 50. ) ]
|
||||
# clientput "Waiting for" $dlytime "ms..."
|
||||
# clientput "Waiting for" $dlytime "ms..."
|
||||
after $dlytime
|
||||
|
||||
# clientput "tc1 reading is: " [tc1 get]
|
||||
|
||||
@@ -43,7 +43,7 @@ proc histmem_acquire_period_sequence { Np Nf } {
|
||||
histmem start
|
||||
|
||||
set dlytime [ expr int( 1000 * $Nf / 50. ) ]
|
||||
# clientput "Waiting for" $dlytime "ms..."
|
||||
# clientput "Waiting for" $dlytime "ms..."
|
||||
# after $dlytime
|
||||
|
||||
# clientput "tc1 reading is: " [tc1 get]
|
||||
|
||||
@@ -103,7 +103,7 @@ set move_count 10
|
||||
# Set axis_config as follows to use different axis configurations
|
||||
# 0: tilt stage configuration
|
||||
# 1: eulerian cradle
|
||||
# 2: small omega
|
||||
# 2: small omega
|
||||
# 3: Oxford magnet sample stick
|
||||
set axis_config 0
|
||||
|
||||
@@ -427,7 +427,7 @@ oct long_name oct
|
||||
|
||||
# Monochromator Focusing (Ge)
|
||||
## ffr 31/7/2012
|
||||
## absEncHome was found to be 16777217 on 31/7/2012 when the
|
||||
## absEncHome was found to be 16777217 on 31/7/2012 when the
|
||||
## encoder clocked over to 114 counts to give a posn
|
||||
## reading of 4793.458008
|
||||
## The encoder has a 12bit resolution (ie 12bits/turn 4096)
|
||||
|
||||
@@ -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.21 30001
|
||||
MakeSafetyPLC plc plc_chan 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user