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

tcl/startup/autofill.tcl

@@ -19,7 +19,7 @@ proc makeHeFill {levcmd} {
     if {$levcmd eq "ccu"} {
       makenv hefill he_ext_ccu ccu
     } elseif {$levcmd eq "ccu4ilm"} {
-      makenv hefill -driver ccu4ext he lev
+      makenv hefill -driver ccu4ext he /lev
       lappend fast_cmd {lev mode 1}
       lappend slow_cmd {lev mode 0}
     } else {
@@ -90,7 +90,7 @@ proc makeN2Fill {{option ccu} {code 0}} {
     GraphAdd n2.upper K_2 N2_Upper red
     GraphAdd n2.lower K_2 N2_Lower green
   } elseif {$option eq "ccu4ilm"} {
-    makenv ln2fill -driver ccu4ext n2 "lev n2"
+    makenv ln2fill -driver ccu4ext n2 /lev/n2
     GraphAdd lev.n2 % "N2_level" black
     if {! $c} {
       # switch silently to inactive

tcl/startup/dilpars.tcl

@@ -0,0 +1,8 @@
+proc apply_dilpars {} {
+  catch {
+    ts auto/condenseflow [hval dilpars/condenseflow]
+  }
+  catch {
+    ts auto/circulateflow [hval dilpars/circulateflow]
+  }
+}

tcl/startup/frappy.tcl

@@ -177,7 +177,7 @@ proc get_param_values {hp} {
 }
 
 proc check_or_do {doit service cfgs} {
-  # result: 1: no change needed, 0: change needed, 2: failure
+  # result: 1: no change needed, 0: change needed, "ERROR:...": failure
   set result 1
   set config ""
   set stick ""
@@ -199,7 +199,7 @@ proc check_or_do {doit service cfgs} {
       if {$doit} {
         if {[hval /device/confirmed] eq [hval /device/name]} {
           set msg "do not allow frappy to change from [hval /device/name] to $config"
-          clientlog $msg
+          clientlog ERROR:$msg
           return $msg
         }
         clientlog 0