From 975f6b38a0d06cd45d8bf4a4636044ba6cfdb9ae Mon Sep 17 00:00:00 2001
From: eiger <markus.zolliker@psi.ch>
Date: Thu, 15 Sep 2022 12:55:36 +0200
Subject: [PATCH 1/4] add comment about i1

---
 tcl/ill5pgas5.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tcl/ill5pgas5.config b/tcl/ill5pgas5.config
index e2def36..faf9b82 100644
--- a/tcl/ill5pgas5.config
+++ b/tcl/ill5pgas5.config
@@ -32,6 +32,7 @@ makenv pccu -driver ccu4 pressure_ccu
 makenv p -driver ccupressure pccu 28
 GraphAdd p bar p auto
 
+# needed for TASMAD: must be drivable
 makenv i1 -driver drvpar /p
 
 hsetprop /tc group "capillary temperature"

From 2b6c73cf547471c7d0215b08b175831b7a310c4b Mon Sep 17 00:00:00 2001
From: tasp <markus.zolliker@psi.ch>
Date: Fri, 7 Oct 2022 14:28:07 +0200
Subject: [PATCH 2/4] improve nv settings

- bigger toleance by default
- nv set 1 by default
---
 tcl/drivers/ccu4flow.tcl | 6 +++---
 tcl/ill2.config          | 2 +-
 tcl/ill5.config          | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tcl/drivers/ccu4flow.tcl b/tcl/drivers/ccu4flow.tcl
index aafd8fa..cf6c0ca 100644
--- a/tcl/drivers/ccu4flow.tcl
+++ b/tcl/drivers/ccu4flow.tcl
@@ -41,7 +41,7 @@ proc stdConfig::ccu4flow {args} {
     node flow upd -secop=nvflow
 
     node set out
-    default 2.0
+    default 1.0
     prop check ccu4flow::checkset
     prop write stdSct::complete
     prop label "flow set"
@@ -89,11 +89,11 @@ proc stdConfig::ccu4flow {args} {
       node hystpulse_c par 0
       prop help {motor pulse to overcome hysteresis when closing}
 
-      node tol par 0.1
+      node tol par 0.25
       prop label tolerance
       prop help {valid below 3 mbar}
     
-      node tolhigh par 0.2
+      node tolhigh par 0.5
       prop label tol. above 4
       prop help {valid above 4 mbar}
     
diff --git a/tcl/ill2.config b/tcl/ill2.config
index e0a031d..79eace2 100644
--- a/tcl/ill2.config
+++ b/tcl/ill2.config
@@ -12,6 +12,6 @@ makenv tt -driver [lsdriver]  {
 }
 tt set/limit 310
 makeCCU4 ill2 nv n2 he
-hupdate /nv/set 2.0
+hupdate /nv/set 1.0
 
 source std_orange.table
diff --git a/tcl/ill5.config b/tcl/ill5.config
index 51e70d2..703deec 100644
--- a/tcl/ill5.config
+++ b/tcl/ill5.config
@@ -11,6 +11,7 @@ makenv tt -driver [lsdriver] {
 }
 tt set/limit 310
 makeCCU4 ill5 nv n2 he
+nv set 1
 
 source maxi_orange.table
 

From e13f157e959b2a657f08ef4a3705d634ccf56097 Mon Sep 17 00:00:00 2001
From: tasp <markus.zolliker@psi.ch>
Date: Fri, 7 Oct 2022 14:29:09 +0200
Subject: [PATCH 3/4] reduce nv setting and restroct field on tasp

---
 tcl/ma6.config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tcl/ma6.config b/tcl/ma6.config
index 88a5170..ee69cbe 100644
--- a/tcl/ma6.config
+++ b/tcl/ma6.config
@@ -17,7 +17,7 @@ makenv tt -driver [lsdriver] {
 #tt set/limit 310
 
 makeCCU4 ma6 nv
-hupdate /nv/set 2.0
+hupdate /nv/set 1.2
 makeN2Fill ccu4ilm {
   ln2fill lowlevel 10
   ln2fill highlevel 100
@@ -29,6 +29,9 @@ makeN2Fill ccu4ilm {
 makeHeFill ccu4ilm
 
 makeIps -limit 6 -startRamp 0.3844 -port ma6-ts:3002
+if {[result instrument] eq "tasp"} {
+  mf limit 4
+}
 
 makeIlm -channels 2 -port ma6-ts:3001
 

From 0f5465215f0260eb9387cdd35b60f8d150c40ac7 Mon Sep 17 00:00:00 2001
From: tasp <markus.zolliker@psi.ch>
Date: Fri, 7 Oct 2022 14:30:11 +0200
Subject: [PATCH 4/4] ma10: change wait settings

---
 tcl/ma10.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tcl/ma10.config b/tcl/ma10.config
index 981504e..920a11c 100644
--- a/tcl/ma10.config
+++ b/tcl/ma10.config
@@ -38,6 +38,8 @@ mf gen/limit 10
 
 mf gen/wait_switch_on 15
 mf gen/wait_switch_off 30
+mf gen/wait_stable_leads 5
+mf gen/wait_stable_field 15
 
 makeIpsLev -port ma10-ts:3001 -controller _mf