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/kookaburra/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} {

4
site_ansto/instrument/kookaburra/config/chopper/sct_fermichopper.tcl
View File

@@ -185,7 +185,7 @@ set chname ch$chN
hfactory $fermiPath/$chname/intlck_status/$field plain user int
}
hfactory $chPath/control plain user none
hfactory $chPath/control/device_error plain user text
@@ -238,7 +238,7 @@ set chname ch$chN
hsetprop $fermiPath "RDGAINPHASE" ${scobjNS}::rdVal $fermiPath {prop_gain int_gain phase_gain}
hsetprop $fermiPath "RDSYNMOTDIR" ${scobjNS}::rdVal $fermiPath {ref_delay ref_period sync_srce motdir}
hsetprop $fermiPath "RDIDLE" ${scobjNS}::rdVal $fermiPath idle_toggle
if {$sim_mode == "false"} {
sct_fermi poll $fermiPath $pollrate

16
site_ansto/instrument/kookaburra/config/commands/monodrive.tcl
View File

@@ -1,8 +1,8 @@
# Drive the 3 Monochromator blades as a "bunch"
# Drive the 3 Monochromator blades as a "bunch"
#
# Author: Jing Chen, jgn@ansto.gov.au
#
#
# Date: 11/11/2011
# get a specified parameter value of a motor
@@ -79,25 +79,25 @@ proc DriveMono {mot focus} {
set translateDis [expr $focus - [getSetting $mot position]]
# Determine if the movement is within the ranges of the three motors
if {[expr $mraPosition + $translateDis] > $mraSoftupperlim ||
[expr $mraPosition + $translateDis] < $mraSoftlowerlim} {
if {[expr $mraPosition + $translateDis] > $mraSoftupperlim ||
[expr $mraPosition + $translateDis] < $mraSoftlowerlim} {
broadcast "Error: the movement is out of the range limit of motor mra"
set moveFlag 0
}
if {[expr $mrbPosition + $translateDis] > $mrbSoftupperlim ||
if {[expr $mrbPosition + $translateDis] > $mrbSoftupperlim ||
[expr $mrbPosition + $translateDis] < $mrbSoftlowerlim} {
broadcast "Error: the movement is out of the range limit of motor mrb"
set moveFlag 0
}
if {[expr $mrcPosition + $translateDis] > $mrcSoftupperlim ||
if {[expr $mrcPosition + $translateDis] > $mrcSoftupperlim ||
[expr $mrcPosition + $translateDis] < $mrcSoftlowerlim} {
broadcast "Error: the movement is out of the range limit of motor mrc"
set moveFlag 0
}
# move the three motors
# move the three motors
if {$moveFlag == 1} {
# Unlock the three motors
mra fixed -1

2
site_ansto/instrument/kookaburra/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 {} {
}
}

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

@@ -21,7 +21,7 @@ proc ::histogram_memory::init_OAT_TABLE {} {
hmm configure fat_frame_frequency $freq
hmm configure fat_frame_source INTERNAL
OAT_TABLE -set X { -0.5 0.5 } NXC 16 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1
OAT_TABLE -set X { -0.5 0.5 } NXC 16 Y { -0.5 0.5 } NYC 1024 T { 0 200000 } NTC 1
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message
@@ -92,7 +92,7 @@ proc ::histogram_memory::isc_initialize {} {
::histogram_memory::set_graphtype "two_theta" "boundaries"
# MJL TODO detector geometry for Kookaburra TBD. Figures need revision during commissioning
# Width = 25mm spacing * 16 tubes = 5000mm (??? degree coverage)
# Width = 25mm spacing * 16 tubes = 5000mm (??? degree coverage)
# Height = 1015mm (tube length)
# Radius = 2400mm
detector_active_height_mm 1015

56
site_ansto/instrument/kookaburra/config/motors/motor_configuration.tcl
View File

@@ -90,7 +90,7 @@ bex home 0
# mc1: Premonochromator Crystal Si(111) Tilt
# Gearbox 55:1, 0.5 degree
# Encoder 2P12,
# Encoder 2P12,
set pmchi_Home 8410424
set pmchiStepRate [expr $motorrate*55.0/0.5]
Motor pmchi $motor_driver_type [params \
@@ -118,12 +118,12 @@ pmchi home 0
# mc1: Premonochromator Crystal Si(111) Rotate
# Gearbox 50:1, pitch 1 degree
# Gearbox 50:1, pitch 1 degree
# Encoder 2P25
# Crystal B 0, 18889883
# Crystal HOPG position 179.603806, 2149592
# Crystal HOPG position 179.603806, 2149592
# Crystal HOPG loading position 49.740612, 14253738
set pmom_Home 2102963
set pmom_Home 2102963
set pmomStepRate [expr $motorrate*50.0]
Motor pmom $motor_driver_type [params \
asyncqueue mc1\
@@ -150,9 +150,9 @@ pmom home 0
# mc1: Main Detector - X Translate
# Gearbox 20:1, pitch 5mm
# Gearbox 20:1, pitch 5mm
# Encoder 2p17
set mdet_Home 521939864
set mdet_Home 521939864
set mdetStepRate [expr $motorrate *20.0/5.0]
Motor mdet $motor_driver_type [params \
asyncqueue mc1\
@@ -214,9 +214,9 @@ att home 0
# mc2: CC1 Monochromator Stage Tilt
# Gearbox 20:1, screw pitch 356
# Encoder 2p17
# Encoder 2p17
# 68.681
set m1chi_Home 15016533
set m1chi_Home 15016533
set m1chiSetRate [expr $motorrate*20*100/68.681]
Motor m1chi $motor_driver_type [params \
asyncqueue mc2\
@@ -243,7 +243,7 @@ m1chi home 0
# mc2: CC1 Monochromator Stage Rotation
# Gearbox 100:1, screw pitch 356
# Gearbox 100:1, screw pitch 356
# Encoder 2p25
# m1om_Home 13617081
set m1om_Home 30395150
@@ -279,7 +279,7 @@ m1om Creep_Substep 0.04
# mc2: CC1 Monochromator Stage X Translation
# Gearbox 20:1, pitch 5mm
# Gearbox 20:1, pitch 5mm
# Encoder 2p17
set m1x_Home 3754723
set m1xSetRate [expr $motorrate*20.0/5.0]
@@ -299,14 +299,14 @@ Motor m1x $motor_driver_type [params \
absEncHome $m1x_Home\
cntsPerX [expr -131072/5.0]]
m1x speed 0.3
m1x part crystal
m1x part crystal
m1x long_name m1x
m1x softlowerlim -82
m1x softupperlim 49
m1x softlowerlim -82
m1x softupperlim 49
m1x home 0
# mc2: Slit system - 1 TOP Blade
# Gearbox 55:1, pitch 0.5mm
# Gearbox 55:1, pitch 0.5mm
# Encoder 2p13
set ss1u_Home 918407
set ss1uSetRate [expr $motorrate*55.0/0.5]
@@ -333,10 +333,10 @@ ss1u softupperlim 37
ss1u home 0
# mc2: Slit system - 1 BOTTOM Blade
# mc2: Slit system - 1 BOTTOM Blade
# Gearbox 55:1, pitch 0.5mm
# Encoder 2p13
set ss1d_Home 1157895
set ss1d_Home 1157895
set ss1dSetRate [expr $motorrate*55.0/0.5]
Motor ss1d $motor_driver_type [params \
asyncqueue mc2\
@@ -354,7 +354,7 @@ Motor ss1d $motor_driver_type [params \
absEncHome $ss1d_Home\
cntsPerX 16384]
ss1d speed 0.1
ss1d part slits
ss1d part slits
ss1d long_name ss1d
ss1d softlowerlim -37.8
ss1d softupperlim 35
@@ -392,7 +392,7 @@ ss1l home 0
# mc2: Slit system - 1 RIGHT Blade
# Gearbox 55:1, pitch 0.5mm
# Encoder 2p13
set ss1r_Home 1656697
set ss1r_Home 1656697
set ss1rSetRate [expr $motorrate*55.0/0.5]
Motor ss1r $motor_driver_type [params \
asyncqueue mc2\
@@ -418,8 +418,8 @@ ss1r home 0
# mc2: Sample Changer (Sample Stage) Z Translation
# Gearbox 1:1
#set samz_Home
# Gearbox 1:1
#set samz_Home
#set samzSetRate 25000
#Motor samz $motor_driver_type [params \
asyncqueue mc2\
@@ -448,7 +448,7 @@ ss1r home 0
# Motor Controller 3
# Motor Controller 3
############################
#
#
# mc3: Slit system - 2 TOP Blade
# Gearbox 55:1, pitch 0.5mm
@@ -568,7 +568,7 @@ ss2r home 0
# mc3: CC2 Analyser Stage - Tilt
# Gearbox 20:1, screw pitch 356
# Encoder 2p17
# Encoder 2p17
# 68.681
set m2chi_Home 15512615
set m2chiSetRate [expr $motorrate*20*100/68.681]
@@ -598,7 +598,7 @@ m2chi home 0
# set m2om_Home 15776972
# mc3: CC2 Analyser Stage - Rotation
# Gearbox 100:1, screw pitch 356
# Gearbox 100:1, screw pitch 356
# Encoder 2p25
set m2om_Home 23155978
set m2omSetRate [expr $motorrate*100.0*356.0/360.0]
@@ -631,10 +631,10 @@ m2om Creep_Factor 0.5
m2om Creep_Substep 0.04
# mc3: CC2 Analyser Stage - X Translate
# Gearbox 20:1, pitch 5mm
# mc3: CC2 Analyser Stage - X Translate
# Gearbox 20:1, pitch 5mm
# Encoder 2p17
set m2x_Home 524680153
set m2x_Home 524680153
set m2xSetRate [expr $motorrate*20.0/5.0]
Motor m2x $motor_driver_type [params \
asyncqueue mc3\
@@ -660,9 +660,9 @@ m2x home 0
# mc3: CC2 Analyser Stage - Y Translation
# Gearbox 20:1, pitch 5mm
# Gearbox 20:1, pitch 5mm
# Encoder 2p17
set m2y_Home 516940434
set m2y_Home 516940434
set m2ySetRate [expr $motorrate*20.0/5.0]
Motor m2y $motor_driver_type [params \
asyncqueue mc3\

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

@@ -28,10 +28,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

2
site_ansto/instrument/kookaburra/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

2
site_ansto/instrument/kookaburra/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.204.79 31001
# MakeSafetyPLC plc plc_chan 0
}

10
site_ansto/instrument/kookaburra/config/scan/scan.tcl
View File

@@ -13,17 +13,17 @@ proc filecounts_log {fname txt} {
proc thresholdscan {minVoltage maxVoltage stepVoltage minBMThreshold manBMThreshold stepBMThreshold scantime} {
# following is used to obtain an optimal BM threshold
# following is used to obtain an optimal BM threshold
set fileCounts ../log/bmcounts.log
set fileCountsDiff ../log/bmcountsdiff.log
variable curCount
set fd [open $fileCounts w]
close $fd
set fd [open $fileCountsDiff w]
close $fd
set txt ""
for {set thres $minBMThreshold} {$thres <= $manBMThreshold} {incr thres $stepBMThreshold} {
lappend txt $thres
@@ -51,8 +51,8 @@ proc thresholdscan {minVoltage maxVoltage stepVoltage minBMThreshold manBMThresh
lappend diff [expr [lindex $curCount $ind]-[lindex $curCount [expr $ind-1]]]
}
set txt "$vol : $diff"
filecounts_log $fileCountsDiff $txt
filecounts_log $fileCountsDiff $txt
}
}

4
site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
View File

@@ -1,8 +1,8 @@
# Author: Jing Chen (jgn@ansto.gov.au)
# Required by server_config.tcl
# Required by server_config.tcl
VarMake Instrument Text Internal
Instrument kookaburra
Instrument kookaburra
Instrument lock
#START SERVER CONFIGURATION SECTION