diff --git a/tcl/drivers/dil12.tcl b/tcl/drivers/dil12.tcl index bafec0f..3199b58 100644 --- a/tcl/drivers/dil12.tcl +++ b/tcl/drivers/dil12.tcl @@ -798,13 +798,13 @@ proc dil12::autostep {phase init} { } dil12::check_cool_button if {[result dil p1] < [hvali [sct]/p1low] && [result dil g1] < 5 && - [result dil p2] < [hvali [sct]/p2low] && [result dil v6pos] > 99} { + [result dil p2] < [hvali [sct]/p2low] && [result dil v6pos] > 50} { if {[sct pumptime] == 0} { dil12::openvalves v5a v2a v7 v2 v1 v6 v5 v3 vb_open dil v4a 1 sct pumptime [expr [DoubleTime] + 105] dil12::msg "pump for 2 more minutes" - } elseif {[DoubleTime] > [sct pumptime]} { + } elseif {[DoubleTime] > [sct pumptime] && [result dil v6pos] > 99} { # do not check for vb/vm here, as the user already might manipulate the valves dil12::openvalves v1 v6 v3 v5 dil v4a 0 diff --git a/tcl/drivers/heliox.tcl b/tcl/drivers/heliox.tcl index 03bb43a..42021b0 100644 --- a/tcl/drivers/heliox.tcl +++ b/tcl/drivers/heliox.tcl @@ -27,8 +27,20 @@ proc stdConfig::heliox {} { node pot_state -text upd - node target_hours par 60 + node target_hours par 48 prop help "how many hours the pot should last (< 75)" + + node holdflow out + default 1.5 + prop check heliox::check_holdflow + prop help "flow for holding pressure" + prop write stdSct::complete + + node condenseflow out + default 3 + prop check heliox::check_condenseflow + prop help "flow for condensing" + prop write stdSct::complete } catch { hsetprop /tt getsample hvali /th/pot @@ -67,7 +79,7 @@ proc heliox::check_set {} { set mainsensor /th/pot switch [sctval [sct]/mode] { 1 { - nv set 2.5 + nv set [hvali [sct]/holdflow] th setsorb/channel C th setsorb 20 th mainloop set @@ -75,7 +87,7 @@ proc heliox::check_set {} { run tt [sct target] } 2 { - nv set 2.5 + nv set [hvali [sct]/holdflow] th setsorb/channel C th setsorb 20 th mainloop set @@ -84,7 +96,7 @@ proc heliox::check_set {} { th set [sct target] } 3 { - nv set 2.5 + nv set [hvali [sct]/holdflow] th setsorb/channel B th mainloop setsorb th set 0 @@ -129,7 +141,7 @@ proc heliox::check_mode {} { 0 { } 1 { - nv set 2.5 + nv set [hvali [sct parent]/holdflow] if {[sct target] != [hvali [sct]]} { th set [hvali /th/target] } @@ -139,7 +151,7 @@ proc heliox::check_mode {} { set state "hi-T mode" } 2 { - nv set 2.5 + nv set [hvali [sct parent]/holdflow] if {[sct target] != [hvali [sct]]} { th set [hvali /th/target] } @@ -149,7 +161,7 @@ proc heliox::check_mode {} { set state "mid-T mode" } 3 { - nv set 2.5 + nv set [hvali [sct parent]/holdflow] if {[hvali [sct parent]/lasts_until] > [DoubleTime]} { th set 0 th setsorb/channel B @@ -181,6 +193,20 @@ proc heliox::check_mode {} { sct update [sct target] } +proc heliox::check_condenseflow {} { + if {[sctval [sct parent]/mode] == 4} { + nv set [sct target] + } + sct update [sct target] +} + +proc heliox::check_holdflow {} { + if {[sctval [sct parent]/mode] != 4} { + nv set [sct target] + } + sct update [sct target] +} + proc heliox::complete {} { sct print [lindex {undefined "hi-T mode" "mid-T mode" "low-T mode" "-> condense"} [sct target]] return idle @@ -218,11 +244,11 @@ proc heliox::read {} { } if {[hvali [sct]] == 4} { if {$ts > 3} { - nv set 4 + nv set [hvali [sct parent]/condenseflow] set lasts_until 0 sct condense_deadline [expr $now + 36000] # timeout: should be 3600 } elseif {[result th sorb] > 39} { - nv set 4 + nv set [hvali [sct parent]/condenseflow] # 3He vapor pressure: 200 mbar at 2 K, power law set p [expr 200 * ($ts / 2.0) ** 3.5] # dump pressure at condensation start @@ -244,8 +270,9 @@ proc heliox::read {} { th setsorb/channel B th mainloop setsorb th setsorb [silent 0.25 hgetpropval [sct parent] goto] - sct update 3 - nv set 2.5 + # switch to lowT and trigger check_mode + hset [sct] 3 + nv set [hvali [sct parent]/holdflow] clientput "the 3He pot [hvali [sct parent]/pot_state]" } } diff --git a/tcl/drivers/ipsmag.tcl b/tcl/drivers/ipsmag.tcl index e92c156..e342775 100644 --- a/tcl/drivers/ipsmag.tcl +++ b/tcl/drivers/ipsmag.tcl @@ -303,7 +303,7 @@ proc ipsmag::update_leads {{n_of_slaves 3}} { set msg "slave currents ($currents) are not within $mincur .. $maxcur" hupdate [sct objectPath]/status $msg if {$status eq ""} { - # clientlog "ERROR: $msg" + clientlog "WARNING: $msg" } } elseif {[string match {slave currents *} $status]} { hupdate [sct objectPath]/status ""