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

tcl/drivers/dil12.tcl

@@ -257,6 +257,9 @@ proc stdConfig::dil12 args {
       prop label "remove mixture status"
       prop check dil12::check_removephase
       prop write stdSct::completeUpdate
+
+      node ignore_vti_temp -int par 0
+      prop enum 1
     }
   }
   hset $name/heatermode 0
@@ -992,10 +995,15 @@ proc dil12::autostep {phase init} {
       dil12::openvalves v1 v6 v12 v13 vm_open
 
       sorb mode 0
-      dil12::set_VtiT 1.25
       hset [sct]/onekstate 0
       nv set [silent 5 hvali [sct]/circulateflow]
+      if {[hval [sct]/ignore_vti_temp]} {
+        dil12::set_VtiT 0
+        nv 1 ;# controlled
+      } else {
+        dil12::set_VtiT 1.25
         nv 2 ;# auto
+      }
       dil12::msg ""
     }
     circulate {
@@ -1034,12 +1042,16 @@ proc dil12::autostep {phase init} {
               sct optimize [clock seconds]
               clientput "reduced VTI flow to [hvali [sct]/circulateflow]"
               nv set $circulateflow
+              if {[hval [sct]/ignore_vti_temp]} {
+                nv 1 ;# controlled
+              } else {
                 nv 2 ;# auto
               }
             }
           } 
         }
       }
+    }
     init_finished {
       # close all valves and zero all powers
       dil12::clearButtons

tcl/drivers/secop_4.tcl

@@ -758,7 +758,7 @@ proc secop::update_ {} {
     }
     error_update {
       lassign $val etype erepr
-      set etext erepr
+      set etext $erepr
       regexp {.*'(.*)'} $erepr -> etext
       hsetprop $path geterror "${etype}: $etext"
     }

tcl/drivers/trun.tcl

@@ -496,10 +496,12 @@ proc trun::read_run {} {
   }
   set now [DoubleTime]
   set tr [silent none sct target]
+  set prev_tr [silent $tr sct prev_tr]
+  sct prev_tr $tr
   if {$tr eq "none"} {
     set tr $tmain
   } else {
-    set dif [expr abs($tr) - [hvali [sct]/target]]
+    set dif [expr $tr - $prev_tr]
     updateval_u [sct]/target $tr 0
     set dblmode [silent -1 hval [sct]/dblctrl/mode]
     if {$dblmode >= 0} { # not disabled

tcl/ma15.config

@@ -15,10 +15,10 @@ tt set/limit 310
 
 makeCCU4 ma15 nv he_ilm
 catch {
-  hupdate /nv/set 1.5
+  hupdate /nv/set 1
   nv ctrl/minpulse_o 0.01
   nv ctrl/minpulse_c 0.05
-  nv tol 0.02
+  cc mc 75
 }
 
 makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002

tcl/ori3.config

@@ -11,7 +11,7 @@ makenv tt -driver [lsdriver] {
 }
 tt set/limit 310
 makeCCU4 ori3 nv n2 he
-hupdate /nv/set 1.6
+hupdate /nv/set 1.2
 
 source maxi_orange.table
 

tcl/pfeiffertpg.addon

@@ -1,6 +1,6 @@
 addonDesc = Pfeiffer Pressure gauge RS232
 
-makenv hvac -driver pfeiffertpg -port ldmse3-ts:3005
+makenv hvac -driver pfeiffertpg
 
-GraphAdd hvac mbar ivc blue
+GraphAdd hvac mbar hvac blue
 

tcl/startup/frappy.tcl

@@ -266,10 +266,13 @@ proc frappy_async_client {} {
 
 proc get_all_param {args} {
   foreach obj $args {
+    catch {
       set hp [get_obj_path $obj]
       hnotify $hp 1
       get_param_values $hp
     }
+    # todo: create error message on failure
+  }
 }
 
 proc error_update_script {hp} {

tcl/startup/hepump.tcl

@@ -15,7 +15,7 @@ proc makeHePump {} {
     }
     hset /hepump $type
 
-    if {$type == 0} {
+    if {$type == 0 || $type == 8} {
       makenv hemot -driver trinamic -base /hepump/ hepump
       if {[silent 0 result instconfig sensirion]} {
         makenv nvflow -driver sensirion -controller _hemot

tcl/variox.config

@@ -14,6 +14,6 @@ tt set/limit 310
 tt set/prop 20
 tt set/integ 10
 makeCCU4 variox nv n2 he
-hupdate /nv/set 2.5
+hupdate /nv/set 1.2
 nv ctrl/minpulse_o 0.01
 nv ctrl/minpulse_c 0.1