From 396a76287dde745cf2ce41b2fa6ee96eb6075211 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Tue, 15 Aug 2023 09:49:29 +0200
Subject: [PATCH] Script execution

---
 script/local.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/script/local.py b/script/local.py
index f7cf3381..367ba8ca 100644
--- a/script/local.py
+++ b/script/local.py
@@ -344,22 +344,19 @@ def wait_beam():
         print "Beam ok"
 
 def is_scienta_sampling():
-    try:
-        global SENSORS
-        sample_scienta = False
-        for dev in ["Scienta.spectrum","EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix", "Counts"]:
-            if dev in SENSORS:
-                sample_scienta = True        
-                break
-        for dev in [  # Scienta.spectrum, 
-                EnergyDistribution, AngleDistribution, Scienta.dataMatrix, Counts]:
-            if dev in SENSORS:
-                sample_scienta = True        
-                break
-        return sample_scienta
-    except:
-        print sys.exc_info()
-        
+    global SENSORS
+    sample_scienta = False
+    for dev in [ #Scienta.spectrum",
+            "EnergyDistribution", "AngleDistribution", "Scienta.dataMatrix", "Counts"]:
+        if dev in SENSORS:
+            sample_scienta = True        
+            break
+    for dev in [Scienta.spectrum,EnergyDistribution, AngleDistribution, Scienta.dataMatrix, Counts]:
+        if dev in SENSORS:
+            sample_scienta = True        
+            break
+    return sample_scienta
+    
 def before_readout():
     sample_scienta = is_scienta_sampling()
     wait_beam()