From b2d76968fdccbe2bc51893cd0d1c26e01a53f8e7 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Tue, 22 Aug 2023 15:38:19 +0200
Subject: [PATCH] Closedown

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

diff --git a/config/variables.properties b/config/variables.properties
index c834f870..12076f1a 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Tue Aug 22 12:13:56 CEST 2023
+#Tue Aug 22 15:27:44 CEST 2023
 LastRunDate=230822
-FileSequentialNumber=18666
-DaySequentialNumber=8
+FileSequentialNumber=18667
+DaySequentialNumber=9
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 7199976a..6ccc845e 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -72,20 +72,21 @@ be_axis.setRange(eb2, eb1)
 def plot_cur_spectrum():
     try:
       while get_context().state.running:
-        #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)    
+        try:
+            y = Scienta.spectrum.take(100) 
+            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)    
+        except:        
+            log("Error plotting online spectrum: ", sys.exc_info()[1])
         time.sleep(1.0)
     finally:
         print "Stopping spectrum plotting"