Script execution

2023-08-15 09:49:29 +02:00
parent f7599ff986
commit 396a76287d
1 changed files with 13 additions and 16 deletions
@@ -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()