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-11-25 15:14:22 +01:00
parent d02a781d59 8c996a108d
commit 1282217907
8 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tcl/dil2.stick
View File

@ -6,6 +6,8 @@ set diln dil2
makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1
ts auto/pumptime1 3600
# lakeshore 370 ctrl # lakeshore 370 ctrl
makenv treg -driver 370_lsc -port ${diln}-ts:3001 { makenv treg -driver 370_lsc -port ${diln}-ts:3001 {
# curves for sample: # curves for sample:

2
tcl/dil3.stick
View File

@ -6,6 +6,8 @@ set dilts dil3-ts.psi.ch
makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1
ts auto/pumptime1 3600
# lakeshore 370 ctrl # lakeshore 370 ctrl
makenv treg -driver 370_lsc -port ${dilts}:3001 { makenv treg -driver 370_lsc -port ${dilts}:3001 {
# curves for sample: # curves for sample:

2
tcl/dil4.stick
View File

@ -6,6 +6,8 @@ set diln dil4
makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1
ts auto/pumptime1 3600
# lakeshore 370 ctrl # lakeshore 370 ctrl
makenv treg -driver 370_lsc -port ${diln}-ts:3001 { makenv treg -driver 370_lsc -port ${diln}-ts:3001 {
# curves for sample: # curves for sample:

8
tcl/drivers/heliox.tcl
View File

@ -79,7 +79,7 @@ proc heliox::check_set {} {
set mainsensor /th/pot set mainsensor /th/pot
switch [sctval [sct]/mode] { switch [sctval [sct]/mode] {
1 { 1 {
nv set [hvali [sct parent]/holdflow]] nv set [hvali [sct]/holdflow]
th setsorb/channel C th setsorb/channel C
th setsorb 20 th setsorb 20
th mainloop set th mainloop set
@ -87,7 +87,7 @@ proc heliox::check_set {} {
run tt [sct target] run tt [sct target]
} }
2 { 2 {
nv set [hvali [sct parent]/holdflow]] nv set [hvali [sct]/holdflow]
th setsorb/channel C th setsorb/channel C
th setsorb 20 th setsorb 20
th mainloop set th mainloop set
@ -96,7 +96,7 @@ proc heliox::check_set {} {
th set [sct target] th set [sct target]
} }
3 { 3 {
nv set [hvali [sct parent]/holdflow]] nv set [hvali [sct]/holdflow]
th setsorb/channel B th setsorb/channel B
th mainloop setsorb th mainloop setsorb
th set 0 th set 0
@ -272,7 +272,7 @@ proc heliox::read {} {
th setsorb [silent 0.25 hgetpropval [sct parent] goto] th setsorb [silent 0.25 hgetpropval [sct parent] goto]
# switch to lowT and trigger check_mode # switch to lowT and trigger check_mode
hset [sct] 3 hset [sct] 3
nv set [hvali [sct parent]/holdflow]] nv set [hvali [sct parent]/holdflow]
clientput "the 3He pot [hvali [sct parent]/pot_state]" clientput "the 3He pot [hvali [sct parent]/pot_state]"
} }
} }

2
tcl/drivers/ipsmag.tcl
View File

@ -303,7 +303,7 @@ proc ipsmag::update_leads {{n_of_slaves 3}} {
set msg "slave currents ($currents) are not within $mincur .. $maxcur" set msg "slave currents ($currents) are not within $mincur .. $maxcur"
hupdate [sct objectPath]/status $msg hupdate [sct objectPath]/status $msg
if {$status eq ""} { if {$status eq ""} {
# clientlog "ERROR: $msg" clientlog "WARNING: $msg"
} }
} elseif {[string match {slave currents *} $status]} { } elseif {[string match {slave currents *} $status]} {
hupdate [sct objectPath]/status "" hupdate [sct objectPath]/status ""

2
tcl/ma6.config
View File

@ -16,7 +16,7 @@ makenv tt -driver [lsdriver] {
#tt set/limit 310 #tt set/limit 310
makeCCU4 ma6 nv makeCCU4 ma6 nv he_ilm
hupdate /nv/set 1.2 hupdate /nv/set 1.2
makeN2Fill ccu4ilm { makeN2Fill ccu4ilm {
ln2fill lowlevel 10 ln2fill lowlevel 10

2
tcl/ma6.stick
View File

@ -1,3 +1,3 @@
stickDesc = standard MA6 stick stickDesc = standard MA6 stick
stick_sensors x63161 x63163 stick_sensors x63161 undefined

6
tcl/startup/ccu4make.tcl
View File

@ -89,6 +89,12 @@ proc makeCCU4 {args} {
} }
he_ilm { he_ilm {
makenv hefill -driver ccu4ext he lev makenv hefill -driver ccu4ext he lev
set vessel [silent 0 result instconfig hevessel]
if {$vessel ne "0"} {
catch {cc hea 1}
catch {cc hem0 475}
catch {cc hfu0 0}
}
GraphAdd lev % He_Level brown GraphAdd lev % He_Level brown
GraphAdd cc.h0 % HeVessel blue GraphAdd cc.h0 % HeVessel blue
hsetprop /hefill fast_cmd "lev mode 1\ncc hf 1" hsetprop /hefill fast_cmd "lev mode 1\ncc hf 1"