From 641470ac84dacc5ba35f964059736b511003bf83 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Tue, 22 Aug 2023 12:16:22 +0200
Subject: [PATCH] Closedown

---
 config/variables.properties |  6 +++---
 script/XPSSpectrum.py       | 27 +++++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 98f55a05..c834f870 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Tue Aug 22 11:56:01 CEST 2023
+#Tue Aug 22 12:13:56 CEST 2023
 LastRunDate=230822
-FileSequentialNumber=18663
-DaySequentialNumber=5
+FileSequentialNumber=18666
+DaySequentialNumber=8
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 8f82c95a..7199976a 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -72,17 +72,19 @@ be_axis.setRange(eb2, eb1)
 def plot_cur_spectrum():
     try:
       while get_context().state.running:
-        y = Scienta.spectrum.take(100)
-        x = Scienta.spectrumX
-        #x = Scienta.spectrumScale.take(100)
-        if len(y)>len(x):
-            y=y[:len(x)]
-        spectrum_series.setData(x, y)
-
-        eb2, eb1 = get_binding_range(plots[0])
-        if (be_axis.min != eb2) or (be_axis.max != eb1):
-            plots[0].resetZoom()    
-            be_axis.setRange(eb2, eb1)    
+        #y = Scienta.spectrum.take(100) ###TODO restore
+        y = Scienta.spectrum.read()
+        if y is not None:
+            x = Scienta.spectrumX
+            #x = Scienta.spectrumScale.take(100)
+            if len(y)>len(x):
+                y=y[:len(x)]
+            spectrum_series.setData(x, y)
+    
+            eb2, eb1 = get_binding_range(plots[0])
+            if (be_axis.min != eb2) or (be_axis.max != eb1):
+                plots[0].resetZoom()    
+                be_axis.setRange(eb2, eb1)    
         
         time.sleep(1.0)
     finally:
@@ -145,7 +147,8 @@ try:
                 if beam_ok:
                     if image_data is None:
                         time.sleep(2.0)
-                        (_width, _height) = Scienta.getImageSize()
+                        size = Scienta.getImageSize()
+                        (_width, _height,) = (size[0], size[1])
                     break
             if ydata is None:
                 ydata = spectrum_array