Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea
This commit is contained in:
@ -1,4 +1,4 @@
|
|||||||
deviceDesc = DIL5 Frappy history recorder
|
stickDesc = DIL5 Frappy history recorder
|
||||||
|
|
||||||
set ::secop_version 4
|
set ::secop_version 4
|
||||||
|
|
||||||
|
@ -15,3 +15,4 @@ if {[string match "prep*" $ins]} {
|
|||||||
makenv frappy_stick -driver secop -port localhost:15201
|
makenv frappy_stick -driver secop -port localhost:15201
|
||||||
makeHePump
|
makeHePump
|
||||||
}
|
}
|
||||||
|
GraphOrder K W mbar % Tesla Ohm
|
||||||
|
@ -16,9 +16,9 @@ makenv tt -driver [lsdriver] {
|
|||||||
tt set/limit 310
|
tt set/limit 310
|
||||||
tt maxwait 7200
|
tt maxwait 7200
|
||||||
makeCCU4 ill1 nv n2 he
|
makeCCU4 ill1 nv n2 he
|
||||||
hupdate /nv/set 1.5
|
hupdate /nv/set 0.6
|
||||||
nv ctrl/deriv_o 10
|
nv ctrl/deriv_o 30
|
||||||
nv ctrl/deriv_c 10
|
nv ctrl/deriv_c 30
|
||||||
nv ctrl/prop_o 0.2
|
nv ctrl/prop_o 0.2
|
||||||
nv ctrl/prop_c 0.1
|
nv ctrl/prop_c 0.1
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
deviceDesc = MB11 stick Frappy history recorder
|
stickDesc = MB11 stick Frappy history recorder
|
||||||
|
|
||||||
set ::secop_version 4
|
set ::secop_version 4
|
||||||
|
|
||||||
|
@ -257,6 +257,9 @@ proc GraphOrder args {
|
|||||||
}
|
}
|
||||||
foreach unit [graph_order items] {
|
foreach unit [graph_order items] {
|
||||||
foreach {item enable} $new($unit) {
|
foreach {item enable} $new($unit) {
|
||||||
|
if {"$unit" eq "none"} {
|
||||||
|
set enable 0
|
||||||
|
}
|
||||||
graph_shown makeitem $item $enable
|
graph_shown makeitem $item $enable
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user