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

tcl/ori7.stick

@@ -0,0 +1,3 @@
+stickDesc = standard ORI7 stick
+
+stick_sensors x186350 undefined

tcl/seacom.tcl

@@ -655,7 +655,7 @@ proc stick_sensors {sensor1 sensor2} {
 proc fix_stick_sensors {} {
   # fix stick sensors
   foreach path {/tt/ts/curve /tt/ts_2/curve} {
-     set curv [silent "" sctval $path]
+     set curv [sctval $path ""]
      if {$curv ne ""} {
        hset $path $curv
      }

tcl/startup/haake.tcl

@@ -8,7 +8,7 @@ proc makeHaake {{name thermostat} {with2sensors 0}} {
 proc haakeLayout {{name ""} args} {
   if {[string compare [sicsdescriptor th] notfound] == 0} return 
   set reset 1
-  if {! [result th running]} {
+  if {! [result th pumprunning]} {
     Style Warning
     Label pump not running
     NoNewline
@@ -61,7 +61,7 @@ proc haakeLayout {{name ""} args} {
     set reset 0
   }
   Newline
-  CheckBox "pump running" "th running"
+  CheckBox "pump running" "th pumprunning"
   CheckBox "confirm alarm" "th reset/$reset"
   Tip "check this if an external sample sensor is used"
   if {[result th with2sensors] >= 0} {