Fix up whitespace.
This commit is contained in:
Ferdi Franceschini
@@ -5,161 +5,161 @@
|
||||
# assumes tc1 and tc2 are the cf8 336 and 340 lakeshores for now
|
||||
|
||||
namespace eval cf {
|
||||
variable wall_lag 10
|
||||
variable wall_max 300
|
||||
variable sample_tolerance 5
|
||||
variable wall_tolerance 5
|
||||
variable wall_set true
|
||||
variable base_set true
|
||||
variable base_control true
|
||||
variable wall_control true
|
||||
variable wall_lag 10
|
||||
variable wall_max 300
|
||||
variable sample_tolerance 5
|
||||
variable wall_tolerance 5
|
||||
variable wall_set true
|
||||
variable base_set true
|
||||
variable base_control true
|
||||
variable wall_control true
|
||||
|
||||
proc UseWall {_wall_set _wall_control} {
|
||||
variable wall_set
|
||||
variable wall_control
|
||||
if {$_wall_set == false} {set wall_set false} else {set wall_set true}
|
||||
if {$_wall_control == false} {set wall_control false} else {set wall_control true}
|
||||
}
|
||||
proc UseWall {_wall_set _wall_control} {
|
||||
variable wall_set
|
||||
variable wall_control
|
||||
if {$_wall_set == false} {set wall_set false} else {set wall_set true}
|
||||
if {$_wall_control == false} {set wall_control false} else {set wall_control true}
|
||||
}
|
||||
|
||||
proc UseBase {_base_set _base_control} {
|
||||
variable base_set
|
||||
variable base_control
|
||||
if {$_base_set == false} {set base_set false} else {set base_set true}
|
||||
if {$_base_control == false} {set base_control false} else {set base_control true}
|
||||
}
|
||||
proc UseBase {_base_set _base_control} {
|
||||
variable base_set
|
||||
variable base_control
|
||||
if {$_base_set == false} {set base_set false} else {set base_set true}
|
||||
if {$_base_control == false} {set base_control false} else {set base_control true}
|
||||
}
|
||||
|
||||
|
||||
proc WallParams {_wall_lag _wall_max _wall_tolerance} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable wall_tolerance
|
||||
set wall_lag $_wall_lag
|
||||
set wall_max $_wall_max
|
||||
set wall_tolerance $_wall_tolerance
|
||||
hset /sample/tc2/control/tolerance1 $wall_tolerance
|
||||
}
|
||||
proc WallParams {_wall_lag _wall_max _wall_tolerance} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable wall_tolerance
|
||||
set wall_lag $_wall_lag
|
||||
set wall_max $_wall_max
|
||||
set wall_tolerance $_wall_tolerance
|
||||
hset /sample/tc2/control/tolerance1 $wall_tolerance
|
||||
}
|
||||
|
||||
proc TempSet {temp} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable base_set
|
||||
variable wall_set
|
||||
set tempc [expr {$temp - $wall_lag}]
|
||||
if {$tempc < 4} {set tempc 4}
|
||||
if {$tempc > $wall_max} {set tempc $wall_max}
|
||||
hset /sample/tc1/sensor/setpoint1 $temp
|
||||
if {$base_set} {hset /sample/tc1/sensor/setpoint2 $tempc}
|
||||
if {$wall_set} {hset /sample/tc2/sensor/setpoint1 $tempc}
|
||||
}
|
||||
proc TempSet {temp} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable base_set
|
||||
variable wall_set
|
||||
set tempc [expr {$temp - $wall_lag}]
|
||||
if {$tempc < 4} {set tempc 4}
|
||||
if {$tempc > $wall_max} {set tempc $wall_max}
|
||||
hset /sample/tc1/sensor/setpoint1 $temp
|
||||
if {$base_set} {hset /sample/tc1/sensor/setpoint2 $tempc}
|
||||
if {$wall_set} {hset /sample/tc2/sensor/setpoint1 $tempc}
|
||||
}
|
||||
|
||||
proc TempDrive {temp} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable base_control
|
||||
variable wall_control
|
||||
TempSet $temp
|
||||
set tempc [expr {$temp - $wall_lag}]
|
||||
if {$tempc < 4} {set tempc 4}
|
||||
if {$tempc > $wall_max} {set tempc $wall_max}
|
||||
set drstr "drive tc1_driveable \$temp"
|
||||
if {$base_control} {append drstr " tc1_driveable2 \$tempc"}
|
||||
if {$wall_control} {append drstr " tc2_driveable \$tempc"}
|
||||
eval $drstr
|
||||
}
|
||||
proc TempDrive {temp} {
|
||||
variable wall_lag
|
||||
variable wall_max
|
||||
variable base_control
|
||||
variable wall_control
|
||||
TempSet $temp
|
||||
set tempc [expr {$temp - $wall_lag}]
|
||||
if {$tempc < 4} {set tempc 4}
|
||||
if {$tempc > $wall_max} {set tempc $wall_max}
|
||||
set drstr "drive tc1_driveable \$temp"
|
||||
if {$base_control} {append drstr " tc1_driveable2 \$tempc"}
|
||||
if {$wall_control} {append drstr " tc2_driveable \$tempc"}
|
||||
eval $drstr
|
||||
}
|
||||
|
||||
proc Tolerance {sample} {
|
||||
hset /sample/tc1/control/tolerance1 $sample
|
||||
hset /sample/tc1/control/tolerance2 $sample
|
||||
}
|
||||
proc Tolerance {sample} {
|
||||
hset /sample/tc1/control/tolerance1 $sample
|
||||
hset /sample/tc1/control/tolerance2 $sample
|
||||
}
|
||||
|
||||
proc MakeCold {} {
|
||||
variable sample_tolerance
|
||||
variable wall_tolerance
|
||||
Tolerance 20
|
||||
hset /sample/tc2/control/tolerance1 20
|
||||
hset /sample/tc2/sensor/setpoint1 4
|
||||
TempDrive 4
|
||||
Tolerance $sample_tolerance
|
||||
hset /sample/tc2/control/tolerance1 $wall_tolerance
|
||||
wait 300
|
||||
}
|
||||
proc MakeCold {} {
|
||||
variable sample_tolerance
|
||||
variable wall_tolerance
|
||||
Tolerance 20
|
||||
hset /sample/tc2/control/tolerance1 20
|
||||
hset /sample/tc2/sensor/setpoint1 4
|
||||
TempDrive 4
|
||||
Tolerance $sample_tolerance
|
||||
hset /sample/tc2/control/tolerance1 $wall_tolerance
|
||||
wait 300
|
||||
}
|
||||
|
||||
|
||||
proc TempRun {temp delay numsteps oscno} {
|
||||
TempDrive $temp
|
||||
wait $delay
|
||||
newfile HISTOGRAM_XY
|
||||
for {set i 0} {$i < $numsteps} {incr i} {
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
}
|
||||
}
|
||||
proc TempRun {temp delay numsteps oscno} {
|
||||
TempDrive $temp
|
||||
wait $delay
|
||||
newfile HISTOGRAM_XY
|
||||
for {set i 0} {$i < $numsteps} {incr i} {
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
}
|
||||
}
|
||||
|
||||
proc RampRun {start step fin oscno delay} {
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XY
|
||||
set loopvar 1
|
||||
set i 0
|
||||
while {$loopvar} {
|
||||
set j [expr {$i*$step+$start}]
|
||||
if {$j> $fin && $step > 0} {break}
|
||||
if {$j< $fin && $step < 0} {break}
|
||||
TempSet $j
|
||||
wait $delay
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
incr i
|
||||
}
|
||||
}
|
||||
proc RampRun {start step fin oscno delay} {
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XY
|
||||
set loopvar 1
|
||||
set i 0
|
||||
while {$loopvar} {
|
||||
set j [expr {$i*$step+$start}]
|
||||
if {$j> $fin && $step > 0} {break}
|
||||
if {$j< $fin && $step < 0} {break}
|
||||
TempSet $j
|
||||
wait $delay
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
incr i
|
||||
}
|
||||
}
|
||||
|
||||
proc StepRun {start step fin oscno delay} {
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XY
|
||||
set loopvar 1
|
||||
set i 0
|
||||
while {$loopvar} {
|
||||
set j [expr {$i*$step+$start}]
|
||||
if {$j> $fin && $step > 0} {break}
|
||||
if {$j< $fin && $step < 0} {break}
|
||||
TempDrive $j
|
||||
wait $delay
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
incr i
|
||||
}
|
||||
}
|
||||
proc StepRun {start step fin oscno delay} {
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XY
|
||||
set loopvar 1
|
||||
set i 0
|
||||
while {$loopvar} {
|
||||
set j [expr {$i*$step+$start}]
|
||||
if {$j> $fin && $step > 0} {break}
|
||||
if {$j< $fin && $step < 0} {break}
|
||||
TempDrive $j
|
||||
wait $delay
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
incr i
|
||||
}
|
||||
}
|
||||
|
||||
proc HeaterOn {} {
|
||||
variable base_set
|
||||
variable wall_set
|
||||
proc HeaterOn {} {
|
||||
variable base_set
|
||||
variable wall_set
|
||||
|
||||
hset /sample/tc1/heater/heaterRange_1 4
|
||||
if {$base_set} {hset /sample/tc1/heater/heaterRange_2 4}
|
||||
if {$wall_set} {hset /sample/tc2/heater/heaterRange 5}
|
||||
}
|
||||
hset /sample/tc1/heater/heaterRange_1 4
|
||||
if {$base_set} {hset /sample/tc1/heater/heaterRange_2 4}
|
||||
if {$wall_set} {hset /sample/tc2/heater/heaterRange 5}
|
||||
}
|
||||
|
||||
proc GetTemp {} {
|
||||
variable base_set
|
||||
set t1top [hget /sample/tc1/sensor/sensorValueA]
|
||||
broadcast "sample top : $t1top"
|
||||
if {$base_set} {
|
||||
set t1base [hget /sample/tc1/sensor/sensorValueB]
|
||||
broadcast "sample base: $t1base"
|
||||
}
|
||||
set t1wall [hget /sample/tc2/sensor/sensorValueA]
|
||||
broadcast "sample wall: $t1wall"
|
||||
}
|
||||
proc GetTemp {} {
|
||||
variable base_set
|
||||
set t1top [hget /sample/tc1/sensor/sensorValueA]
|
||||
broadcast "sample top : $t1top"
|
||||
if {$base_set} {
|
||||
set t1base [hget /sample/tc1/sensor/sensorValueB]
|
||||
broadcast "sample base: $t1base"
|
||||
}
|
||||
set t1wall [hget /sample/tc2/sensor/sensorValueA]
|
||||
broadcast "sample wall: $t1wall"
|
||||
}
|
||||
|
||||
|
||||
|
||||
namespace export *
|
||||
namespace ensemble create
|
||||
namespace export *
|
||||
namespace ensemble create
|
||||
}
|
||||
|
||||
publish cf user
|
||||
|
||||
@@ -1,109 +1,109 @@
|
||||
|
||||
proc SetVoltPosStep {steps} {
|
||||
|
||||
|
||||
# set llen 16384
|
||||
# set steplen [expr{int($llen/(2*$steps))}]
|
||||
# set phaselen
|
||||
|
||||
set l {}
|
||||
for {set i 0} {$i < $steps} {incr i} {
|
||||
lappend l [expr {($i*2.0/$steps)-1.0}]
|
||||
}
|
||||
for {set i $steps} {$i > 0} {incr i -1} {
|
||||
lappend l [expr {($i*2.0/$steps)-1.0}]
|
||||
}
|
||||
set s "DATA VOLATILE, "
|
||||
for {set i 0} {$i < [expr {[llength $l] -1}]} {incr i} {
|
||||
append s [format "%1.3f" [lindex $l $i]] ","
|
||||
}
|
||||
append s [format "%1.3f" [lindex $l [expr {[llength $l] -1}]]]
|
||||
sct_pulser send $s
|
||||
broadcast $s
|
||||
|
||||
|
||||
set l {}
|
||||
for {set i 0} {$i < $steps} {incr i} {
|
||||
lappend l [expr {($i*2.0/$steps)-1.0}]
|
||||
}
|
||||
for {set i $steps} {$i > 0} {incr i -1} {
|
||||
lappend l [expr {($i*2.0/$steps)-1.0}]
|
||||
}
|
||||
set s "DATA VOLATILE, "
|
||||
for {set i 0} {$i < [expr {[llength $l] -1}]} {incr i} {
|
||||
append s [format "%1.3f" [lindex $l $i]] ","
|
||||
}
|
||||
append s [format "%1.3f" [lindex $l [expr {[llength $l] -1}]]]
|
||||
sct_pulser send $s
|
||||
broadcast $s
|
||||
|
||||
}
|
||||
|
||||
proc SetVoltBiStep {steps} {
|
||||
set l {}
|
||||
for {set i 0} {$i < $steps} {incr i} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
for {set i $steps} {$i > [expr {$steps * -1}]} {incr i -1} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
for {set i [expr {$steps * -1}]} {$i < 0} {incr i} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
|
||||
set s "DATA VOLATILE, "
|
||||
for {set i 0} {$i < [expr {[llength $l] -1}]} {incr i} {
|
||||
append s [format "%1.3f" [lindex $l $i]] ","
|
||||
}
|
||||
append s [format "%1.3f" [lindex $l [expr {[llength $l] -1}]]]
|
||||
sct_pulser send $s
|
||||
broadcast $s
|
||||
|
||||
|
||||
set l {}
|
||||
for {set i 0} {$i < $steps} {incr i} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
for {set i $steps} {$i > [expr {$steps * -1}]} {incr i -1} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
for {set i [expr {$steps * -1}]} {$i < 0} {incr i} {
|
||||
lappend l [expr {$i*1.0/$steps}]
|
||||
}
|
||||
|
||||
set s "DATA VOLATILE, "
|
||||
for {set i 0} {$i < [expr {[llength $l] -1}]} {incr i} {
|
||||
append s [format "%1.3f" [lindex $l $i]] ","
|
||||
}
|
||||
append s [format "%1.3f" [lindex $l [expr {[llength $l] -1}]]]
|
||||
sct_pulser send $s
|
||||
broadcast $s
|
||||
|
||||
|
||||
}
|
||||
|
||||
proc VoltPosStep {volt freq voltsteps} {
|
||||
PulserOff
|
||||
newfile HISTOGRAM_XYT
|
||||
|
||||
SetVoltPosStep $voltsteps
|
||||
sct_pulser send "VOLT:LOW [VoltScale 0.0]; LOW?"
|
||||
sct_pulser send "VOLT:HIGH [VoltScale [expr {$volt*1.0}]]; HIGH?"
|
||||
sct_pulser send "FREQ $freq;:FREQ?"
|
||||
sct_pulser send "FUNC: USER VOLATILE"
|
||||
sct_pulser send "FUNC USER"
|
||||
|
||||
PulserOff
|
||||
newfile HISTOGRAM_XYT
|
||||
|
||||
SetVoltPosStep $voltsteps
|
||||
sct_pulser send "VOLT:LOW [VoltScale 0.0]; LOW?"
|
||||
sct_pulser send "VOLT:HIGH [VoltScale [expr {$volt*1.0}]]; HIGH?"
|
||||
sct_pulser send "FREQ $freq;:FREQ?"
|
||||
sct_pulser send "FUNC: USER VOLATILE"
|
||||
sct_pulser send "FUNC USER"
|
||||
|
||||
}
|
||||
|
||||
|
||||
proc UniZigTexture {motor mstart mstep mnum volt freq vstep binmult oscno} {
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XYT
|
||||
set bins [expr {$vstep * 2 * $binmult}]
|
||||
histmem_period_strobo $freq $bins
|
||||
wait 3
|
||||
# set pulservolt [VoltScale [expr {$volt*1.0}]]
|
||||
# set pulseroffs [VoltScale [expr {$volt*0.5}]]
|
||||
VoltPosStep $volt $freq $vstep
|
||||
histmem mode unlimited
|
||||
newfile HISTOGRAM_XYT
|
||||
set bins [expr {$vstep * 2 * $binmult}]
|
||||
histmem_period_strobo $freq $bins
|
||||
wait 3
|
||||
# set pulservolt [VoltScale [expr {$volt*1.0}]]
|
||||
# set pulseroffs [VoltScale [expr {$volt*0.5}]]
|
||||
VoltPosStep $volt $freq $vstep
|
||||
|
||||
PulserOn
|
||||
PulserOn
|
||||
|
||||
for {set i 0} {$i < $mnum} {incr i} {
|
||||
drive $motor [expr $i*$mstep+$mstart]
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
}
|
||||
PulserOff
|
||||
for {set i 0} {$i < $mnum} {incr i} {
|
||||
drive $motor [expr $i*$mstep+$mstart]
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
hmm countblock
|
||||
save $i
|
||||
}
|
||||
PulserOff
|
||||
}
|
||||
|
||||
|
||||
|
||||
proc VoltBiStep {volt freq steps} {
|
||||
PulserOff
|
||||
newfile HISTOGRAM_XYT
|
||||
|
||||
SetVoltBiStep $steps
|
||||
sct_pulser send "VOLT:LOW [VoltScale [expr {$volt*-1.0}]; LOW?"
|
||||
sct_pulser send "VOLT:HIGH [VoltScale [expr {$volt*1.0}]; HIGH?"
|
||||
sct_pulser send "FREQ $freq;:FREQ?"
|
||||
sct_pulser send "FUNC: USER VOLATILE"
|
||||
sct_pulser send "FUNC USER"
|
||||
set bins [expr {$steps * 4}]
|
||||
histmem_period_strobo $freq $bins
|
||||
wait 3
|
||||
|
||||
PulserOn
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
save 0
|
||||
PulserOff
|
||||
newfile HISTOGRAM_XYT
|
||||
|
||||
SetVoltBiStep $steps
|
||||
sct_pulser send "VOLT:LOW [VoltScale [expr {$volt*-1.0}]; LOW?"
|
||||
sct_pulser send "VOLT:HIGH [VoltScale [expr {$volt*1.0}]; HIGH?"
|
||||
sct_pulser send "FREQ $freq;:FREQ?"
|
||||
sct_pulser send "FUNC: USER VOLATILE"
|
||||
sct_pulser send "FUNC USER"
|
||||
set bins [expr {$steps * 4}]
|
||||
histmem_period_strobo $freq $bins
|
||||
wait 3
|
||||
|
||||
PulserOn
|
||||
oct oscillate_count $oscno
|
||||
oct oscillate start
|
||||
save 0
|
||||
}
|
||||
|
||||
|
||||
publish SetVoltPosStep user
|
||||
publish SetVoltBiStep user
|
||||
publish UniZigTexture user
|
||||
publish VoltPosStep user
|
||||
publish VoltBiStep user
|
||||
publish VoltBiStep user
|
||||
|
||||
Reference in New Issue
Block a user