From 749b177ee21628cc1ed98a7e5fac76e6c209582b Mon Sep 17 00:00:00 2001
From: eiger <markus.zolliker@psi.ch>
Date: Mon, 3 Jul 2023 17:53:44 +0200
Subject: [PATCH 1/5] adjust ma15 settings

---
 tcl/ma15.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcl/ma15.config b/tcl/ma15.config
index 0cbebe9..f2ea536 100644
--- a/tcl/ma15.config
+++ b/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

From c588a86a63ade266b6c59dc51ad9d71317a23665 Mon Sep 17 00:00:00 2001
From: eiger <markus.zolliker@psi.ch>
Date: Mon, 3 Jul 2023 17:54:19 +0200
Subject: [PATCH 2/5] fix a check for neodry pump

---
 tcl/startup/hepump.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcl/startup/hepump.tcl b/tcl/startup/hepump.tcl
index fc22477..7008cb2 100644
--- a/tcl/startup/hepump.tcl
+++ b/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

From 66be0e0684d026c4915abcbeba5c334f61164e22 Mon Sep 17 00:00:00 2001
From: eiger <markus.zolliker@psi.ch>
Date: Mon, 3 Jul 2023 17:55:02 +0200
Subject: [PATCH 3/5] make pfeffertpg more general

---
 tcl/pfeiffertpg.addon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcl/pfeiffertpg.addon b/tcl/pfeiffertpg.addon
index 22c54df..045cd3f 100644
--- a/tcl/pfeiffertpg.addon
+++ b/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
 

From 94b4dbdf82b66273b58b5c2fdb76c44e4293c2ab Mon Sep 17 00:00:00 2001
From: dmc <markus.zolliker@psi.ch>
Date: Mon, 3 Jul 2023 17:59:47 +0200
Subject: [PATCH 4/5] drivers/dil12.tcl: add ignore_vti_temp

helps in case vti temperature is not reliable
---
 tcl/drivers/dil12.tcl | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tcl/drivers/dil12.tcl b/tcl/drivers/dil12.tcl
index 3199b58..d5169ab 100644
--- a/tcl/drivers/dil12.tcl
+++ b/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]
-      nv 2 ;# auto
+      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,7 +1042,11 @@ proc dil12::autostep {phase init} {
               sct optimize [clock seconds]
               clientput "reduced VTI flow to [hvali [sct]/circulateflow]"
               nv set $circulateflow
-              nv 2 ;# auto
+              if {[hval [sct]/ignore_vti_temp]} {
+                nv 1 ;# controlled
+              } else {
+                nv 2 ;# auto
+              }
             }
           } 
         }

From 74acd765eed5a772a008624a0d33f7a6861caf0b Mon Sep 17 00:00:00 2001
From: dmc <markus.zolliker@psi.ch>
Date: Mon, 3 Jul 2023 18:04:25 +0200
Subject: [PATCH 5/5] reduce nv flow for variox

---
 tcl/variox.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcl/variox.config b/tcl/variox.config
index cf64014..2bb42c3 100644
--- a/tcl/variox.config
+++ b/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