From 1296bac2241b908b82ba214049bf339324b4aa3b Mon Sep 17 00:00:00 2001
From: dmc <markus.zolliker@psi.ch>
Date: Thu, 6 Jun 2024 15:37:30 +0200
Subject: [PATCH 1/3] ill1: reduce nv minflow

+ increase nv ctrl/deriv_o and nv/ctrl/deriv_c
---
 tcl/ill1.config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tcl/ill1.config b/tcl/ill1.config
index 2df9da5..bc6f2c7 100644
--- a/tcl/ill1.config
+++ b/tcl/ill1.config
@@ -16,9 +16,9 @@ makenv tt -driver [lsdriver] {
 tt set/limit 310
 tt maxwait 7200
 makeCCU4 ill1 nv n2 he
-hupdate /nv/set 1.5
-nv ctrl/deriv_o 10
-nv ctrl/deriv_c 10
+hupdate /nv/set 0.6
+nv ctrl/deriv_o 30
+nv ctrl/deriv_c 30
 nv ctrl/prop_o 0.2
 nv ctrl/prop_c 0.1
 

From 175f7f7f1834daa7be06c0fab3563e0fa0f5ae5f Mon Sep 17 00:00:00 2001
From: dmc <markus.zolliker@psi.ch>
Date: Mon, 10 Jun 2024 13:18:33 +0200
Subject: [PATCH 2/3] remove varioxB.*

---
 tcl/dil5.stick | 2 +-
 tcl/mb11.stick | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcl/dil5.stick b/tcl/dil5.stick
index 3df72ae..e413300 100644
--- a/tcl/dil5.stick
+++ b/tcl/dil5.stick
@@ -1,4 +1,4 @@
-deviceDesc = DIL5 Frappy history recorder
+stickDesc = DIL5 Frappy history recorder
 
 set ::secop_version 4
 
diff --git a/tcl/mb11.stick b/tcl/mb11.stick
index 613f28f..0ea1b0e 100644
--- a/tcl/mb11.stick
+++ b/tcl/mb11.stick
@@ -1,4 +1,4 @@
-deviceDesc = MB11 stick Frappy history recorder
+stickDesc = MB11 stick Frappy history recorder
 
 set ::secop_version 4
 

From b99c9481f6f94a49c9865eba35d94f9a177b29cc Mon Sep 17 00:00:00 2001
From: dmc <markus.zolliker@psi.ch>
Date: Tue, 11 Jun 2024 10:46:54 +0200
Subject: [PATCH 3/3] sort graph nicely with frappy2.config

---
 tcl/frappy2.config    | 1 +
 tcl/startup/graph.tcl | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/tcl/frappy2.config b/tcl/frappy2.config
index 134c560..836ec49 100644
--- a/tcl/frappy2.config
+++ b/tcl/frappy2.config
@@ -15,3 +15,4 @@ if {[string match "prep*" $ins]} {
   makenv frappy_stick -driver secop -port localhost:15201
   makeHePump
 }
+GraphOrder K W mbar % Tesla Ohm
diff --git a/tcl/startup/graph.tcl b/tcl/startup/graph.tcl
index 4c56028..edb31e5 100644
--- a/tcl/startup/graph.tcl
+++ b/tcl/startup/graph.tcl
@@ -257,6 +257,9 @@ proc GraphOrder args {
     }
     foreach unit [graph_order items] {
       foreach {item enable} $new($unit) {
+        if {"$unit" eq "none"} {
+          set enable 0
+        }
         graph_shown makeitem $item $enable
       }
     }