From d757c1923e8422f360ca1994baa8c1d8a7b35ee5 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Tue, 28 Nov 2023 13:14:06 +0100
Subject: [PATCH] current color values; added kill both colors button

---
 colors.py | 122 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 48 deletions(-)

diff --git a/colors.py b/colors.py
index a441101..9c7011a 100644
--- a/colors.py
+++ b/colors.py
@@ -22,65 +22,86 @@ N_UNDS.remove(N_UND_CHIC)
 
 
 color1 = {
-    6: 2.0618975071726737,
-    7: 2.0618998489503135,
-    8: 2.061926961690368,
-    9: 2.0618991835864264,
-    10: 2.061919185767039,
-    11: 2.0619176190165964,
-    12: 2.0618790520140906,
-    13: 2.052086641409292,
+    6: 2.9733,
+    7: 2.9733,
+    8: 2.9733,
+    9: 2.9733,
+    10: 2.9733,
+    11: 2.9733,
+    12: 2.9733,
+    13: 2.9633,
 
-    15: 1.1842616466870595,
-    16: 1.2842673674062317,
-    17: 1.3842579267233892,
-    18: 1.484294303739585,
-    19: 1.6843694577800838,
-    20: 1.584281331329752,
-    21: 1.2842820179639072,
-    22: 1.3842844240055432
+    15: 3.3349,
+    16: 3.3282,
+    17: 3.2344,
+    18: 3.3517,
+    19: 3.3169,
+    20: 3.3407,
+    21: 3.3477,
+    22: 3.2467
 }
 
 
 color2 = {
-    6: 1.0843075706646517,
-    7: 1.1843037624109625,
-    8: 1.3842958393058413,
-    9: 1.4843045803089876,
-    10: 1.5843035457018615,
-    11: 1.8400123990046287,
-    12: 1.6843112146639572,
-    13: 1.7742896734281286,
+    6: 2.7249,
+    7: 2.818,
+    8: 2.766,
+    9: 2.7539,
+    10: 2.8251,
+    11: 2.7392,
+    12: 2.7545,
+    13: 2.7353,
  
-    15: 2.124329777953559,
-    16: 2.124339587297864,
-    17: 2.124344707174983,
-    18: 2.1243781537048076,
-    19: 2.1243433061478303,
-    20: 2.124360736030826,
-    21: 2.124337879383864,
-    22: 2.11434429180146
+    15: 3.4958,
+    16: 3.4958,
+    17: 3.4958,
+    18: 3.4958,
+    19: 3.4958,
+    20: 3.4958,
+    21: 3.4958,
+    22: 3.4808
 }
 
 
 colors_both = {
-    6: 2.061898658676767,
-    7: 2.0619010015723753,
-    8: 2.061836025091557,
-    9: 2.0619014907947957,
-    10: 2.0619007931739812,
-    11: 2.0619164451260863,
-    12: 2.061841664062066,
-    13: 2.0520064916331067,
+    6: 2.9733,
+    7: 2.9733,
+    8: 2.9733,
+    9: 2.9733,
+    10: 2.9733,
+    11: 2.9733,
+    12: 2.9733,
+    13: 2.9633,
  
-    15: 2.124321241942164,
-    16: 2.1243286922141595,
-    17: 2.124315652168558,
-    18: 2.124332151134097,
-    19: 2.124354200526172,
-    20: 2.1243170649754792,
-    21: 2.1243234280187435,
-    22: 2.11434068217272
+    15: 3.4958,
+    16: 3.4958,
+    17: 3.4958,
+    18: 3.4958,
+    19: 3.4958,
+    20: 3.4958,
+    21: 3.4958,
+    22: 3.4808
+}
+
+
+kill_both = {
+    6: 2.7249,
+    7: 2.818,
+    8: 2.766,
+    9: 2.7539,
+    10: 2.8251,
+    11: 2.7392,
+    12: 2.7545,
+    13: 2.7353,
+
+    15: 3.3349,
+    16: 3.3282,
+    17: 3.2344,
+    18: 3.3517,
+    19: 3.3169,
+    20: 3.3407,
+    21: 3.3477,
+    22: 3.2467
 }
 
 
@@ -136,6 +157,11 @@ def enable_color2():
 def enable_colors_both():
     put_color(colors_both)
 
+@as_shortcut
+def kill_both_colors():
+    put_color(kill_both)
+
+
 #@as_shortcut
 #def reset_undulators():
 #    put_color(colors_reset)