2020-09-30 09:06:13 +02:00
parent 1507333ad4
commit 5183f24ecb
8 changed files with 690 additions and 31 deletions
--- a/script/devices/diag.py
+++ b/script/devices/diag.py
@@ -69,12 +69,12 @@ def get_diags():
        try:
            ret[k]=str(v.read())
        except:
-            ret[k]="Error: " + sys.exc_info()[1]
+            ret[k]="Error: " + str(sys.exc_info()[1])
    for k,v in diag_channels.items():
        try:
            ret[k]=caget(v,'s')
        except:
-            ret[k]="Error: " + sys.exc_info()[1]
+            ret[k]="Error: " + str(sys.exc_info()[1])
    ret["exposure time"] = str(eiger.getExposure())
    return OrderedDict(sorted(ret.items(), key=lambda i: i[0].lower()))