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

This commit is contained in:
2023-09-05 17:50:37 +02:00
86 changed files with 8300 additions and 10 deletions

View File

@ -31,4 +31,4 @@ calib tlist 1.38 1.42 1.51 logstep0.04 288 302 310
# timing is such that 2 * 24h are not enough
# try with a little more precision (expecially at hi T)
calib slopelimit 0.002
calib slopelimit 0.005

View File

@ -5,9 +5,6 @@ defineTemperature tt
makenv tt -driver [lsdriver] {
lsc_sensor tm B -sensor pt1000e -sensorname main -alarm 650
lsc_sensor te C -sensor x31318 -sensorname screen
# lsc_sensor tk A -sensor x31319 -sensorname coldfinger -alarm 310
# 2.8.2022 changed tk from ChA to ChD
#--this is a temporary fix-- needs to be undone when the wiring has been fixed
lsc_sensor tk A -sensor x31319 -sensorname coldfinger -alarm 310
lsc_loop set -loop 1 -channel B -maxheater 100W -resist 25Ohm
if {[lsdriver] eq "336_lsc"} {

View File

@ -30,3 +30,8 @@ makenv warmup -driver piloop -invar "tt" -outvar "tt current/manualpower" \
-prop 0.0005 -int 120 -outmin 0 -outmax 0.053
GraphAdd warmup.output kW Htr_wup auto
# pressure reading (from flukepe.addon)
makenv p -driver fluke45 { (X + 0.00015) * 500 * 900 }
GraphAdd p bar p dark_green

View File

@ -72,7 +72,6 @@ proc ccu4ext::changestate {type state} {
cc $auto 1
}
fill {
clientlog FILL$type
cc $cmd 1
cc $auto 1
}

View File

@ -264,6 +264,7 @@ proc stdConfig::dil12 args {
}
hset $name/heatermode 0
dolater 0 hset $name/autoprop/integ 5
dolater 0 apply_dilpars
}
proc dil12::check_set {} {

18
tcl/drivers/dilpars.tcl Normal file
View File

@ -0,0 +1,18 @@
# any parameter to be entered by hand
namespace eval dilpars {} {
}
proc stdConfig::dilpars {args} {
variable hostport none
variable name
controller syncedprot
scanargs $args var -circulateflow 4 -condenseflow 8
obj dummy -none
kids hidden {
node condenseflow par $condenseflow
node circulateflow par $circulateflow
}
dolater 0 apply_dilargs
}

View File

@ -53,7 +53,11 @@ appendVars n2coolPar.istate|i|State|1 lc|mbar|Lambda_p|4
makeN2cool "tcoil ta"
catch {
# finish hour (tomorrow morning)
n2coolPar time 6
# previous procedure:
# day 1, morning: start N2, day2 morning: start fill (fast, He vessel pressurized)
# new procedure
# day 1, morning or noon: start N2:, day2 afternoon: slow fill overnight (self pressured He vessel)
n2coolPar time 12
# target temperature for MagBot
n2coolPar topLimit 85
# cooling rate K / min.

View File

@ -31,5 +31,6 @@ makenv table -driver table /tt/tm {
table tbl_tt_dblctrl_prop_lo 20:0.1 50:0.4
makenv dilpars -driver dilpars -condenseflow 3 -circulateflow 1.6
#GraphAdd cc.mp sec pulse red
#GraphAdd cc.msp sec speed green

View File

@ -92,6 +92,7 @@ proc makeCCU4 {args} {
set vessel [silent 0 result instconfig hevessel]
if {$vessel ne "0"} {
catch {cc hea 1}
catch {cc hav 2}
catch {cc hem0 475}
catch {cc hfu0 0}
}