linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up whitespace.

Browse Source
This commit is contained in:
Ferdi Franceschini
2015-03-13 11:57:56 +11:00
parent e7e2e87b83
commit 88c1f007fa
3 changed files with 537 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
site_ansto/instrument/config/commands/hvcommands.tcl
View File

@ -28,8 +28,8 @@ proc SetVolt {volt} {
set pulserstate 0 set pulserstate 0
} else { } else {
set pulservolt [VoltScale $volt] set pulservolt [VoltScale $volt]
# sct_pulser send "VOLT:OFFS $pulservolt; OFFS?" # sct_pulser send "VOLT:OFFS $pulservolt; OFFS?"
# PulserDC $pulservolt # PulserDC $pulservolt
if {$pulserstate==0} { if {$pulserstate==0} {
PulserDC $pulservolt PulserDC $pulservolt
PulserOn PulserOn
@ -228,7 +228,7 @@ proc SquarePulseVolt {start step fin freq bins oscno} {
set pulservolt [VoltScale $j] set pulservolt [VoltScale $j]
PulserSquare $freq $pulservolt PulserSquare $freq $pulservolt
PulserOn PulserOn
# sct_pulser send "APPL:SQU $freq,$pulservolt,0" # sct_pulser send "APPL:SQU $freq,$pulservolt,0"
} }
oct oscillate_count $oscno oct oscillate_count $oscno
oct oscillate start oct oscillate start
@ -249,7 +249,7 @@ proc SquarePulseFreq {volt freqlist bins oscno} {
wait 3 wait 3
PulserSquare $freq $pulservolt PulserSquare $freq $pulservolt
PulserOn PulserOn
# sct_pulser send "APPL:SQU $freq,$pulservolt,0" # sct_pulser send "APPL:SQU $freq,$pulservolt,0"
oct oscillate_count $oscno oct oscillate_count $oscno
oct oscillate start oct oscillate start
hmm countblock hmm countblock
@ -306,12 +306,12 @@ proc UniPulseFreq {volt freqlist bins oscno} {
histmem_period_strobo $freq $bins histmem_period_strobo $freq $bins
wait 3 wait 3
# PulserSquareOffs $freq $pulservolt [expr {$pulservolt/2}] # PulserSquareOffs $freq $pulservolt [expr {$pulservolt/2}]
set pulservolt [VoltScale [expr {$volt*1.0}]] set pulservolt [VoltScale [expr {$volt*1.0}]]
set pulseroffs [VoltScale [expr {$volt*0.5}]] set pulseroffs [VoltScale [expr {$volt*0.5}]]
PulserSquareOffs $freq $pulservolt $pulseroffs PulserSquareOffs $freq $pulservolt $pulseroffs
PulserOn PulserOn
# sct_pulser send "APPL:SQU $freq,$pulservolt,[expr {$pulservolt/2}]" # sct_pulser send "APPL:SQU $freq,$pulservolt,[expr {$pulservolt/2}]"
oct oscillate_count $oscno oct oscillate_count $oscno
oct oscillate start oct oscillate start
hmm countblock hmm countblock

4
site_ansto/instrument/hipd/config/commands/hvsteps.tcl
View File

@ -65,8 +65,8 @@ proc UniZigTexture {motor mstart mstep mnum volt freq vstep binmult oscno} {
set bins [expr {$vstep * 2 * $binmult}] set bins [expr {$vstep * 2 * $binmult}]
histmem_period_strobo $freq $bins histmem_period_strobo $freq $bins
wait 3 wait 3
# set pulservolt [VoltScale [expr {$volt*1.0}]] # set pulservolt [VoltScale [expr {$volt*1.0}]]
# set pulseroffs [VoltScale [expr {$volt*0.5}]] # set pulseroffs [VoltScale [expr {$volt*0.5}]]
VoltPosStep $volt $freq $vstep VoltPosStep $volt $freq $vstep
PulserOn PulserOn