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

72
site_ansto/instrument/lyrebird/config/tasmad/sicscommon/fourcircle.tcl
View File

@@ -1,7 +1,7 @@
#----------------------------------------------------------
# This is a file full of support functions for four
# circle diffraction in the new four circle system. This
# is the common, shared stuff. There should be another
# This is a file full of support functions for four
# circle diffraction in the new four circle system. This
# is the common, shared stuff. There should be another
# file which contains the instrument specific adaptions.
#
# Mark Koennecke, August 2008, November 2008, February 2009
@@ -10,7 +10,7 @@ if { [info exists __singlexinit] == 0 } {
set __singlexinit 1
MakeSingleX
Publish projectdir Spy
Publish cell Spy
Publish cell Spy
Publish ub Spy
Publish spgrp Spy
Publish calcang Spy
@@ -18,7 +18,7 @@ if { [info exists __singlexinit] == 0 } {
Publish calctth Spy
Publish refclear User
Publish reflist Spy
# Publish refang User
# Publish refang User
Publish refdel User
Publish refhkl User
Publish refang User
@@ -38,7 +38,7 @@ if { [info exists __singlexinit] == 0 } {
Publish tabload user
Publish loadx User
Publish testx User
Publish collconf User
Publish collconf User
Publish hkllimit Spy
Publish hklgen User
Publish indw User
@@ -79,14 +79,14 @@ if { [info exists __singlexinit] == 0 } {
}
#---------------------------------------------------------
# support function for handling ranges in measuring
# reflections. This is tricky: When calculating if a
# reflection is scannable one has to take the range of
# reflections. This is tricky: When calculating if a
# reflection is scannable one has to take the range of
# the scan into account. SICS goes to great pain to calculate
# reflections in spite of restrictions. It tweaks ome, searches
# psi etc. In order to arrive at a scannable position for
# reflections in spite of restrictions. It tweaks ome, searches
# psi etc. In order to arrive at a scannable position for
# calculations and initial driving, the ranges in om and stt
# have to be corrected to include the scan range. These support
# functions take care of this.
# functions take care of this.
#----------------------------------------------------------
set __fmessomup 0
set __fmessomlow 0
@@ -209,7 +209,7 @@ proc getsetangles {} {
proc calchkl args {
set mo [string trim [SplitReply [singlex mode]]]
switch $mo {
bi {
bi {
if {[llength $args] < 4} {
set stt [singlex motval stt]
set om [singlex motval om]
@@ -333,7 +333,7 @@ proc refdel {id} {
}
#--------------------------------------------------------------
proc refhkl {id h k l } {
return [ref setx $id $h $k $l]
return [ref setx $id $h $k $l]
}
#-------------------------------------------------------------
proc refang args {
@@ -427,7 +427,7 @@ proc centerlist {preset {mode monitor} {skip 0} } {
set h [lindex $val 2]
set k [lindex $val 3]
set l [lindex $val 4]
clientput "Processing reflection $refid = $h $k $l"
clientput "Processing reflection $refid = $h $k $l"
set stt [lindex $val 5]
if {$stt > .0} {
set mo [string trim [SplitReply [singlex mode]]]
@@ -519,7 +519,7 @@ proc tablist {} {
}
#---------------------------------------------------------------------------
proc tabclear {} {
return [fmess table clear]
return [fmess table clear]
}
#---------------------------------------------------------------------------
proc tabadd {sttend scanvar step np preset } {
@@ -742,8 +742,8 @@ proc testx args {
proc collconf args {
set modelist [list monitor timer]
if {[llength $args] < 4} {
append res [SplitReply [fmess mode]]
append res [SplitReply [fmess fast]]
append res [SplitReply [fmess mode]]
append res [SplitReply [fmess fast]]
append res " " [SplitReply [fmess weak]]
append res " " [SplitReply [fmess weakthreshold]]
return $res
@@ -808,7 +808,7 @@ proc scanref {ref} {
xxxscan add $ommot $start $step
if {[string first o2t $scanvar] >= 0} {
set start [expr $stt - 2*$range]
xxxscan add $sttmot $start [expr $step * 2.]
xxxscan add $sttmot $start [expr $step * 2.]
}
set mode [string trim [SplitReply [fmess mode]]]
xxxscan run $np $mode $preset
@@ -859,7 +859,7 @@ proc hklgen { {sup no} } {
}
#----------------------------------------------------------------
proc indw {hw kw lw} {
return [fmess genw $hw $kw $lw]
return [fmess genw $hw $kw $lw]
}
#----------------------------------------------------------------
proc indsave {filename} {
@@ -873,7 +873,7 @@ proc indsave {filename} {
set idxlist [split [messref show $ref]]
puts $out [format " %12.6f %12.6f %12.6f" [lindex $idxlist 2] \
[lindex $idxlist 3] [lindex $idxlist 4]]
}
close $out
return "Done"
@@ -890,8 +890,8 @@ proc indlist {} {
proc indexconf args {
if {[llength $args] < 2} {
append res "simidxconf = "
append res [SplitReply [simidx sttlim]] ", "
append res [SplitReply [simidx anglim]] " "
append res [SplitReply [simidx sttlim]] ", "
append res [SplitReply [simidx anglim]] " "
return $res
} else {
simidx sttlim [lindex $args 0]
@@ -997,7 +997,7 @@ proc writerafinfile {filename cell} {
puts $out ""
puts $out "-1"
close $out
catch {file attributes $filename -permissions 00664}
catch {file attributes $filename -permissions 00664}
}
#-----------------------------------------------------------
proc writerafnbfile {filename cell} {
@@ -1014,7 +1014,7 @@ proc writerafnbfile {filename cell} {
puts $out ""
puts $out "-1"
close $out
catch {file attributes $filename -permissions 00664}
catch {file attributes $filename -permissions 00664}
}
#---------------------------------------------------------
proc checkResult {filename} {
@@ -1093,7 +1093,7 @@ proc refshow {} {
}
if {[string first 0RESULTS $line] >= 0} {
set dataappend 1
}
}
if {$dataappend == 1} {
append res $line "\n"
}
@@ -1127,7 +1127,7 @@ proc loadub {} {
gets $in line
stscan $line "%f %f %f" u31 u32 u33
singlex ub $u11 $u12 $u13 $u21 $u22 $u23 $u31 $u32 $u33
}
}
if {[string first "0DIRECT CELL" $line] >= 0} {
stscan $line "%s %s %f %f %f %f %f %f" junk junk2 a b c alpha beta gamma
singlex cell $a $b $c $alpha $beta $gamma
@@ -1201,7 +1201,7 @@ proc removeduplicatesold {peaklist} {
foreach fp $final {
if {abs($fp - $peak) < 2.} {
set valid 0
}
}
}
if {$valid == 1} {
lappend final $peak
@@ -1240,7 +1240,7 @@ proc removeduplicates {peaklist countlist} {
return $final
}
#--------------------------------------------------------------------
# Do not be confused by the use of phi. This is also used for finding
# Do not be confused by the use of phi. This is also used for finding
# peaks in omega in NB
#--------------------------------------------------------------------
proc findpeaksinscan {} {
@@ -1321,7 +1321,7 @@ proc searchbi {preset mode maxpeak} {
if {$status != 0} {
clientput "WARNING: Cannot reach chi $chipos, skipping"
continue
}
}
clientput "Searching at chi: $chipos"
success
switch $detmode {
@@ -1354,14 +1354,14 @@ proc searchbi {preset mode maxpeak} {
if {[string first continue $interrupt] < 0} {
error $msg
}
#--------- Do I need to extract peaks from the area detector data or is this to be
# left to anatric?
#--------- Do I need to extract peaks from the area detector data or is this to be
# left to anatric?
}
default {
error "Reflection search not supported for this detector mode"
}
}
}
}
}
}
#-----------------------------------------------------------------------
@@ -1447,7 +1447,7 @@ proc searchnb {preset mode maxpeak} {
error "Reflection search not supported for this detector mode"
}
}
}
}
}
}
#--------------------------------------------------------------------------------------
@@ -1598,7 +1598,7 @@ proc psiscan {h k l step stepom omnp preset {countmode NULL}} {
break
}
}
}
}
clientput "Scanning at $psi"
set ompos [string trim [SplitReply [om]]]
set status [catch {cscan om $ompos $stepom $omnp $preset} msg]
@@ -1610,7 +1610,7 @@ proc psiscan {h k l step stepom omnp preset {countmode NULL}} {
} else {
clientput "ERROR: $msg while scanning"
}
}
}
set stt [SplitReply [stt]]
set chi [SplitReply [chi]]
set phi [SplitReply [phi]]
@@ -1679,7 +1679,7 @@ proc savexxx {filename} {
return "Done"
}
#======================================================================================
# Stuff to support Hipadaba
# Stuff to support Hipadaba
#======================================================================================
proc ubrefinehdb args {
set path /instrument/reflection_list/ubrefresult