diff --git a/tcl/dil2.stick b/tcl/dil2.stick index 5391579..16a5c13 100644 --- a/tcl/dil2.stick +++ b/tcl/dil2.stick @@ -6,6 +6,8 @@ set diln dil2 makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 +ts auto/pumptime1 3600 + # lakeshore 370 ctrl makenv treg -driver 370_lsc -port ${diln}-ts:3001 { # curves for sample: diff --git a/tcl/dil3.stick b/tcl/dil3.stick index 511052a..1d3e8a5 100644 --- a/tcl/dil3.stick +++ b/tcl/dil3.stick @@ -6,6 +6,8 @@ set dilts dil3-ts.psi.ch makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 +ts auto/pumptime1 3600 + # lakeshore 370 ctrl makenv treg -driver 370_lsc -port ${dilts}:3001 { # curves for sample: diff --git a/tcl/dil4.stick b/tcl/dil4.stick index 05361b9..0e2d16f 100644 --- a/tcl/dil4.stick +++ b/tcl/dil4.stick @@ -6,6 +6,8 @@ set diln dil4 makenv ts -driver dil12 -reg370 /treg -mon370 /tmon -hasturbo 1 +ts auto/pumptime1 3600 + # lakeshore 370 ctrl makenv treg -driver 370_lsc -port ${diln}-ts:3001 { # curves for sample: diff --git a/tcl/drivers/heliox.tcl b/tcl/drivers/heliox.tcl index 29087d6..42021b0 100644 --- a/tcl/drivers/heliox.tcl +++ b/tcl/drivers/heliox.tcl @@ -79,7 +79,7 @@ proc heliox::check_set {} { set mainsensor /th/pot switch [sctval [sct]/mode] { 1 { - nv set [hvali [sct parent]/holdflow]] + nv set [hvali [sct]/holdflow] th setsorb/channel C th setsorb 20 th mainloop set @@ -87,7 +87,7 @@ proc heliox::check_set {} { run tt [sct target] } 2 { - nv set [hvali [sct parent]/holdflow]] + nv set [hvali [sct]/holdflow] th setsorb/channel C th setsorb 20 th mainloop set @@ -96,7 +96,7 @@ proc heliox::check_set {} { th set [sct target] } 3 { - nv set [hvali [sct parent]/holdflow]] + nv set [hvali [sct]/holdflow] th setsorb/channel B th mainloop setsorb th set 0 @@ -272,7 +272,7 @@ proc heliox::read {} { th setsorb [silent 0.25 hgetpropval [sct parent] goto] # switch to lowT and trigger check_mode hset [sct] 3 - nv set [hvali [sct parent]/holdflow]] + 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 "" diff --git a/tcl/ma6.config b/tcl/ma6.config index ee69cbe..3b5cbb5 100644 --- a/tcl/ma6.config +++ b/tcl/ma6.config @@ -16,7 +16,7 @@ makenv tt -driver [lsdriver] { #tt set/limit 310 -makeCCU4 ma6 nv +makeCCU4 ma6 nv he_ilm hupdate /nv/set 1.2 makeN2Fill ccu4ilm { ln2fill lowlevel 10 diff --git a/tcl/ma6.stick b/tcl/ma6.stick index d6aac64..c691879 100644 --- a/tcl/ma6.stick +++ b/tcl/ma6.stick @@ -1,3 +1,3 @@ stickDesc = standard MA6 stick -stick_sensors x63161 x63163 +stick_sensors x63161 undefined diff --git a/tcl/startup/ccu4make.tcl b/tcl/startup/ccu4make.tcl index 0d0082c..12580b1 100644 --- a/tcl/startup/ccu4make.tcl +++ b/tcl/startup/ccu4make.tcl @@ -89,6 +89,12 @@ proc makeCCU4 {args} { } he_ilm { 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 cc.h0 % HeVessel blue hsetprop /hefill fast_cmd "lev mode 1\ncc hf 1"