Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea
This commit is contained in:
@ -447,7 +447,16 @@ proc trun::read_run {} {
|
||||
}
|
||||
if {$dblctrl} {
|
||||
if {[hval [sct]/dblctrl/mode] == 0} { # inactive -> stable
|
||||
hupdate [sct]/dblctrl/mode 1
|
||||
set tol [hvali [sct]/tolerance]
|
||||
set tg [silent $tsample sct target]
|
||||
if {$tg > $tsample + $tol} {
|
||||
set dmode 2 ;# up
|
||||
} elseif {$tg < $tsample - $tol} {
|
||||
set dmode 3 ;# down
|
||||
} else {
|
||||
set dmode 1 ;# stable
|
||||
}
|
||||
hupdate [sct]/dblctrl/mode $dmode
|
||||
}
|
||||
set value $tsample
|
||||
} else {
|
||||
|
@ -6,7 +6,7 @@ device stick_menu "ma11 ma11t hvolt dil2 dil3 dil4 coil"
|
||||
makenv tt -driver [lsdriver] {
|
||||
lsc_sensor tm B -sensor x14667 -sensorname VTI
|
||||
lsc_sensor ts C -sensorname sample
|
||||
lsc_sensor tm_pt A -sensor pt-100 -sensorname VTI_pt -color hidden
|
||||
lsc_sensor tm_pt A -sensor pt-100 -sensorname VTI_pt -color hidden -alarm 0
|
||||
lsc_sensor ts_2 D -sensor code -sensorname sample2
|
||||
# lsc_sensor ts_2 D -sensor x63166 -sensorname sample2 -color hidden
|
||||
lsc_loop set -loop 1 -channel B -maxheater 80W -resist 40Ohm -color green
|
||||
|
13
tcl/varioxb.stick
Normal file
13
tcl/varioxb.stick
Normal file
@ -0,0 +1,13 @@
|
||||
stickDesc = VarioxB stick Frappy history recorder
|
||||
|
||||
set ::secop_version 4
|
||||
|
||||
set ins [result instrument]
|
||||
if {[string match "prep*" $ins]} {
|
||||
set nr [string range $ins end end]
|
||||
makenv frappy_stick -driver secop -port localhost:1521$nr
|
||||
} elseif {[lindex [split [info hostname] .] 0] ne $ins} {
|
||||
error "runs on instruments or prep0-9 only"
|
||||
} else {
|
||||
makenv frappy_stick -driver secop -port localhost:15201
|
||||
}
|
Reference in New Issue
Block a user