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

Pull in Wombat changes to hvcommands.tcl

Browse Source
This commit is contained in:
Douglas Clowes
2014-06-25 13:20:20 +10:00
parent 95974df5e4
commit ccc47a4c57
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,8 +137,9 @@ proc UniPulseTexture {motor start step numsteps volt freq bins oscno} {
newfile HISTOGRAM_XYT
histmem_period_strobo $freq $bins
wait 3
set pulservolt [VoltScale [expr ($volt*1.0/2)]]
PulserSquareOffs $freq $pulservolt $pulservolt
set pulservolt [VoltScale [expr {$volt*1.0}]]
set pulseroffs [VoltScale [expr {$volt*0.5}]]
PulserSquareOffs $freq $pulservolt $pulseroffs
PulserOn
for {set i 0} {$i < $numsteps} {incr i} {
@ -261,11 +262,13 @@ proc UniPulseFreq {volt freqlist bins oscno} {
set loopvar 1
set i 0
foreach freq $freqlist {
set pulservolt [VoltScale [expr ($volt*1.0/2)]]
histmem_period_strobo $freq $bins
wait 3
# PulserSquareOffs $freq $pulservolt [expr {$pulservolt/2}]
PulserSquareOffs $freq $pulservolt $pulservolt
set pulservolt [VoltScale [expr {$volt*1.0}]]
set pulseroffs [VoltScale [expr {$volt*0.5}]]
PulserSquareOffs $freq $pulservolt $pulseroffs
PulserOn
# pulser send "APPL:SQU $freq,$pulservolt,[expr {$pulservolt/2}]"
oscmd start $oscno
@ -380,6 +383,7 @@ proc OneTri {volt period} {
publish GetVolt user
publish SetDC user
publish SetVolt user
publish SetVoltScale user
publish SingleVolt user
publish VoltRamp user
publish SquarePulseVolt user
@ -387,10 +391,10 @@ publish SquarePulseFreq user
publish UniPulseFreq user
publish VoltTextureRamp user
publish VoltPulses user
publish VoltPulseRun user
publish VoltTriPulses user
publish OneTri user
publish UniPulseFatigue user
publish SetVoltScale user
publish SquarePulseTexture user
publish BehlkePulseTexture user
publish BehlkePulseFreq user

2
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@ -51,6 +51,8 @@ fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(hmm)/hmm_rapid.tcl
source gumxml.tcl
# Wombat only change to hvcommands' scaleval variable
SetVoltScale 2000.0
# The Alice Thing
# Qlink : 9600, 8 data, 1 stop, No Parity, None Flow