Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea
This commit is contained in:
@ -17,3 +17,4 @@ GraphAdd t_be_filter.det K_4 Detector
|
|||||||
t_be_filter relay1 A
|
t_be_filter relay1 A
|
||||||
t_be_filter relay2 B
|
t_be_filter relay2 B
|
||||||
|
|
||||||
|
hsetprop /t_be_filter layoutpos 90
|
||||||
|
@ -13,5 +13,8 @@ tt set/limit 310
|
|||||||
makeCCU4 ill5 nv n2 he
|
makeCCU4 ill5 nv n2 he
|
||||||
nv set 1
|
nv set 1
|
||||||
|
|
||||||
|
nv ctrl/prop_o 0.05
|
||||||
|
nv ctrl/prop_c 0.03
|
||||||
|
|
||||||
source maxi_orange.table
|
source maxi_orange.table
|
||||||
|
|
||||||
|
@ -5,8 +5,12 @@ set ::secop_version 4
|
|||||||
set ins [result instrument]
|
set ins [result instrument]
|
||||||
if {[string match "prep*" $ins]} {
|
if {[string match "prep*" $ins]} {
|
||||||
set nr [string range $ins end end]
|
set nr [string range $ins end end]
|
||||||
|
makenv frappy_main -driver secop -port localhost:1511$nr
|
||||||
|
makeHePump
|
||||||
|
} elseif {[lindex [split [info hostname] .] 0] ne $ins} {
|
||||||
|
error "runs on instruments or prep0-9 only"
|
||||||
} else {
|
} else {
|
||||||
error "runs on prep0-9 only"
|
makenv frappy_main -driver secop -port localhost:15101
|
||||||
|
makenv frappy_stick -driver secop -port localhost:15201
|
||||||
|
makeHePump
|
||||||
}
|
}
|
||||||
makenv frappy_main -driver secop -port localhost:1511$nr
|
|
||||||
makeHePump
|
|
||||||
|
Reference in New Issue
Block a user