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

Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea

Browse Source
This commit is contained in:
l_samenv
2022-10-17 17:11:46 +02:00
parent a7c4525841 a7a0843753
commit 885f7c90aa
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tcl/drivers/ccu4flow.tcl
View File

@ -41,7 +41,7 @@ proc stdConfig::ccu4flow {args} {
node flow upd -secop=nvflow node flow upd -secop=nvflow
node set out node set out
default 2.0 default 1.0
prop check ccu4flow::checkset prop check ccu4flow::checkset
prop write stdSct::complete prop write stdSct::complete
prop label "flow set" prop label "flow set"
@ -89,11 +89,11 @@ proc stdConfig::ccu4flow {args} {
node hystpulse_c par 0 node hystpulse_c par 0
prop help {motor pulse to overcome hysteresis when closing} prop help {motor pulse to overcome hysteresis when closing}
node tol par 0.1 node tol par 0.25
prop label tolerance prop label tolerance
prop help {valid below 3 mbar} prop help {valid below 3 mbar}
node tolhigh par 0.2 node tolhigh par 0.5
prop label tol. above 4 prop label tol. above 4
prop help {valid above 4 mbar} prop help {valid above 4 mbar}

2
tcl/ill2.config
View File

@ -12,6 +12,6 @@ makenv tt -driver [lsdriver] {
} }
tt set/limit 310 tt set/limit 310
makeCCU4 ill2 nv n2 he makeCCU4 ill2 nv n2 he
hupdate /nv/set 2.0 hupdate /nv/set 1.0
source std_orange.table source std_orange.table

1
tcl/ill5.config
View File

@ -11,6 +11,7 @@ makenv tt -driver [lsdriver] {
} }
tt set/limit 310 tt set/limit 310
makeCCU4 ill5 nv n2 he makeCCU4 ill5 nv n2 he
nv set 1
source maxi_orange.table source maxi_orange.table

1
tcl/ill5pgas5.config
View File

@ -32,6 +32,7 @@ makenv pccu -driver ccu4 pressure_ccu
makenv p -driver ccupressure pccu 28 makenv p -driver ccupressure pccu 28
GraphAdd p bar p auto GraphAdd p bar p auto
# needed for TASMAD: must be drivable
makenv i1 -driver drvpar /p makenv i1 -driver drvpar /p
hsetprop /tc group "capillary temperature" hsetprop /tc group "capillary temperature"

2
tcl/ma10.config
View File

@ -38,6 +38,8 @@ mf gen/limit 10
mf gen/wait_switch_on 15 mf gen/wait_switch_on 15
mf gen/wait_switch_off 30 mf gen/wait_switch_off 30
mf gen/wait_stable_leads 5
mf gen/wait_stable_field 15
makeIpsLev -port ma10-ts:3001 -controller _mf makeIpsLev -port ma10-ts:3001 -controller _mf

5
tcl/ma6.config
View File

@ -17,7 +17,7 @@ makenv tt -driver [lsdriver] {
#tt set/limit 310 #tt set/limit 310
makeCCU4 ma6 nv makeCCU4 ma6 nv
hupdate /nv/set 2.0 hupdate /nv/set 1.2
makeN2Fill ccu4ilm { makeN2Fill ccu4ilm {
ln2fill lowlevel 10 ln2fill lowlevel 10
ln2fill highlevel 100 ln2fill highlevel 100
@ -29,6 +29,9 @@ makeN2Fill ccu4ilm {
makeHeFill ccu4ilm makeHeFill ccu4ilm
makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002 makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002
if {[result instrument] eq "tasp"} {
mf limit 4
}
makeIlm -channels 2 -port ma6-ts:3001 makeIlm -channels 2 -port ma6-ts:3001