diff --git a/tcl/drivers/heliox.tcl b/tcl/drivers/heliox.tcl index af703e1..9493fea 100644 --- a/tcl/drivers/heliox.tcl +++ b/tcl/drivers/heliox.tcl @@ -115,6 +115,7 @@ proc heliox::check_set {} { th mainloop setsorb tt dblctrl 0 tt set 1.25 + catch {hdelprop /ts/mode soft_deadline} } default { error "bad mode" @@ -190,6 +191,7 @@ proc heliox::check_mode {} { set state "-> condense" hsetprop /th target 0.25 hsetprop /ts target 0.25 + catch {hdelprop /ts/mode soft_deadline} } } setmainsensor $mainsensor @@ -230,7 +232,8 @@ proc heliox::read {} { set ts [result th pot] set tsorb [result th sorb] sct lasttime $now - if {$ts > 3 && $tsorb < 10} { + set mode [hvali [sct]] + if {(($mode == 3 && $ts > 2) || ($ts > 3)) && $tsorb < 10} { if {$lasts_until} { clientput "3He pot went empty" } @@ -246,12 +249,12 @@ proc heliox::read {} { set lasts_until 0 } } - if {[hvali [sct]] == 4} { + if {$mode == 4} { if {$ts > 3} { # above 3 K: set deadline nv set [hvali [sct parent]/condenseflow] set lasts_until 0 - sct condense_deadline [expr $now + 3600] # timeout 1 hour + sct condense_deadline [expr $now + 3600] } elseif {[result th sorb] > 39} { nv set [hvali [sct parent]/condenseflow] # 3He vapor pressure: 200 mbar at 2 K, power law @@ -271,7 +274,7 @@ proc heliox::read {} { set sdl [silent $dl sct soft_deadline] if {$dl <= $sdl} { sct soft_deadline $dl - } elseif {$now > $sdl + 600} { + } elseif {$now > $sdl + 300} { clientput "stop condensing - target_hours is probably too high - expect only [expr round($hours)] h hold time" set target_hours $hours } diff --git a/tcl/eurotherm.config b/tcl/eurotherm.config new file mode 100644 index 0000000..d2beb07 --- /dev/null +++ b/tcl/eurotherm.config @@ -0,0 +1,9 @@ +deviceDesc = Eurotherm controller + +makeEuro te control +catch { + te upperlimit 999.9 +} +defineTemperature te + +appendVars te/K/Euro_T/3 te.workset/K/Euro_Set/2 te.output/%/Euro_Htr/1 diff --git a/tcl/instconfig/tasp.tcl b/tcl/instconfig/tasp.tcl index aec3105..f5b8652 100644 --- a/tcl/instconfig/tasp.tcl +++ b/tcl/instconfig/tasp.tcl @@ -1 +1,3 @@ instconfig makeitem sensirion 1 +instconfig makeitem he_pump_type neodry + diff --git a/tcl/jtccr.config b/tcl/jtccr.config index b029595..1d6172c 100644 --- a/tcl/jtccr.config +++ b/tcl/jtccr.config @@ -30,7 +30,7 @@ GraphAdd p4 bar p4 yellow makenv -objname pressreg -driver bronkpreg -port jtccr-ts:3005 18 GraphAdd pressreg bar preg magenta -makenv epc epc8210 -port jtccr-ts:3007 {jt-compressor 1 jt-pump 2 ccr-compressor 3} +makenv epc epc8210 -port jtccr-ts:3007 {jt-compressor 1 jt-pump 2 ccr-compressor 3 roughing 4 turbo 5} diff --git a/tcl/ma7.config b/tcl/ma7.config index 63dd31c..9b22975 100644 --- a/tcl/ma7.config +++ b/tcl/ma7.config @@ -9,11 +9,11 @@ makenv tt -driver [lsdriver] { lsc_sensor ts_2 D -sensor code -sensorname sample2 # lsc_sensor ts_2 D -sensor x63881 -sensorname sample2 lsc_loop set -loop 1 -channel A -maxheater 32W -resist 80Ohm -color green -# if {[lsdriver] eq "336_lsc"} { -# lsc_loop setsamp -loop 2 -channel C -maxheater 62.5W -resist 40Ohm -loopname sample -color dark_green -# 2024 temporary mod for thermalcond stick on prep3 - lsc_loop setsamp -loop 2 -channel C -maxheater 1W -resist 82Ohm -loopname sample -color dark_green -# } + if {[lsdriver] eq "336_lsc"} { + lsc_loop setsamp -loop 2 -channel C -maxheater 62.5W -resist 40Ohm -loopname sample -color dark_green +# for thermalcond stick: (this is a hack - should be solved differently) +# lsc_loop setsamp -loop 2 -channel C -maxheater 0.5W -resist 82Ohm -loopname sample -color dark_green + } } tt set/limit 310 diff --git a/tcl/mb11.config b/tcl/mb11.config index 6a96276..2539336 100644 --- a/tcl/mb11.config +++ b/tcl/mb11.config @@ -15,3 +15,5 @@ if {[string match "prep*" $ins]} { makenv frappy_main -driver secop -port localhost:15101 makeHePump } +dolater 0 GraphOrder K W mbar % Tesla Ohm +dolater 10 GraphOrder K W mbar % Tesla Ohm diff --git a/tcl/mb11std.config b/tcl/mb11std.config new file mode 100644 index 0000000..26ae180 --- /dev/null +++ b/tcl/mb11std.config @@ -0,0 +1,19 @@ +deviceDesc = MB11 Frappy history recorder (for mb11std) + +set ::secop_version 4 + +device stick_menu mb11 dil5 + +set ins [result instrument] +if {[string match "prep*" $ins]} { + 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 { + makenv frappy_main -driver secop -port localhost:15101 + makeHePump +} +dolater 0 GraphOrder K W mbar % Tesla Ohm +dolater 10 GraphOrder K W mbar % Tesla Ohm