diff --git a/PythonServer/screens/odh.py b/PythonServer/screens/odh.py
index 8e6e451643af2a547a1499f06d5af27d6d671cc2..e142baed19c74223f62d7c2699a7dae14f004990 100755
--- a/PythonServer/screens/odh.py
+++ b/PythonServer/screens/odh.py
@@ -11,30 +11,80 @@ class odhScreen(Thread):
self.stop_signal = stop_signal
def run(self):
- pvs = [ 'HCB-ACH:ODH-O2iM-1:O2Level', 'HCB-ACH:ODH-O2iM-1:ODHWarning', 'HCB-ACH:ODH-O2iM-1:ODHAlarm',
- 'HCB-ACH:ODH-O2iM-2:O2Level', 'HCB-ACH:ODH-O2iM-2:ODHWarning', 'HCB-ACH:ODH-O2iM-2:ODHAlarm',
- 'HCB-ACH:ODH-O2iM-3:O2Level', 'HCB-ACH:ODH-O2iM-3:ODHWarning', 'HCB-ACH:ODH-O2iM-3:ODHAlarm',
- 'HCB-ACH:ODH-O2iM-4:O2Level', 'HCB-ACH:ODH-O2iM-4:ODHWarning', 'HCB-ACH:ODH-O2iM-4:ODHAlarm',
- 'HCB-ACH:ODH-O2iM-5:O2Level', 'HCB-ACH:ODH-O2iM-5:ODHWarning', 'HCB-ACH:ODH-O2iM-5:ODHAlarm',
- 'HCB-TCH:ODH-O2iM-6:O2Level', 'HCB-TCH:ODH-O2iM-6:ODHWarning', 'HCB-TCH:ODH-O2iM-6:ODHAlarm',
- 'HCB-TCH:ODH-O2iM-7:O2Level', 'HCB-TCH:ODH-O2iM-7:ODHWarning', 'HCB-TCH:ODH-O2iM-7:ODHAlarm',
- 'HCB-TCH:ODH-O2iM-8:O2Level', 'HCB-TCH:ODH-O2iM-8:ODHWarning', 'HCB-TCH:ODH-O2iM-8:ODHAlarm',
- 'HCB-TCH:ODH-O2iM-9:O2Level', 'HCB-TCH:ODH-O2iM-9:ODHWarning', 'HCB-TCH:ODH-O2iM-9:ODHAlarm',
- 'HCB-HPGS:ODH-O2iM-10:O2Level', 'HCB-HPGS:ODH-O2iM-10:ODHWarning', 'HCB-HPGS:ODH-O2iM-10:ODHAlarm',
- 'HCB-HPGS:ODH-O2iM-11:O2Level', 'HCB-HPGS:ODH-O2iM-11:ODHWarning', 'HCB-HPGS:ODH-O2iM-11:ODHAlarm',
- 'HCB-HPGS:ODH-O2iM-12:O2Level', 'HCB-HPGS:ODH-O2iM-12:ODHWarning', 'HCB-HPGS:ODH-O2iM-12:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-13:O2Level', 'CXB-CXH:ODH-O2iM-13:ODHWarning', 'CXB-CXH:ODH-O2iM-13:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-14:O2Level', 'CXB-CXH:ODH-O2iM-14:ODHWarning', 'CXB-CXH:ODH-O2iM-14:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-15:O2Level', 'CXB-CXH:ODH-O2iM-15:ODHWarning', 'CXB-CXH:ODH-O2iM-15:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-16:O2Level', 'CXB-CXH:ODH-O2iM-16:ODHWarning', 'CXB-CXH:ODH-O2iM-16:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-17:O2Level', 'CXB-CXH:ODH-O2iM-17:ODHWarning', 'CXB-CXH:ODH-O2iM-17:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-18:O2Level', 'CXB-CXH:ODH-O2iM-18:ODHWarning', 'CXB-CXH:ODH-O2iM-18:ODHAlarm',
- 'CXB-CXH:ODH-O2iM-19:O2Level', 'CXB-CXH:ODH-O2iM-19:ODHWarning', 'CXB-CXH:ODH-O2iM-19:ODHAlarm',
- 'CTLG-CS:ODH-O2iM-20:O2Level', 'CTLG-CS:ODH-O2iM-20:ODHWarning', 'CTLG-CS:ODH-O2iM-20:ODHAlarm',
- 'CTLG-CS:ODH-O2iM-21:O2Level', 'CTLG-CS:ODH-O2iM-21:ODHWarning', 'CTLG-CS:ODH-O2iM-21:ODHAlarm',
- 'CTLG-CS:ODH-O2iM-22:O2Level', 'CTLG-CS:ODH-O2iM-22:ODHWarning', 'CTLG-CS:ODH-O2iM-22:ODHAlarm',
- 'KG-GTA:ODH-O2iM-1:O2Level', 'KG-GTA:ODH-O2iM-1:ODHWarning', 'KG-GTA:ODH-O2iM-1:ODHAlarm',
- 'KG-GTA:ODH-O2iM-2:O2Level', 'KG-GTA:ODH-O2iM-2:ODHWarning', 'KG-GTA:ODH-O2iM-2:ODHAlarm' ]
+ pvs = [
+ "HCB-ACH:ODH-O2iM-1:O2Level",
+ "HCB-ACH:ODH-O2iM-1:ODHWarning",
+ "HCB-ACH:ODH-O2iM-1:ODHAlarm",
+ "HCB-ACH:ODH-O2iM-2:O2Level",
+ "HCB-ACH:ODH-O2iM-2:ODHWarning",
+ "HCB-ACH:ODH-O2iM-2:ODHAlarm",
+ "HCB-ACH:ODH-O2iM-3:O2Level",
+ "HCB-ACH:ODH-O2iM-3:ODHWarning",
+ "HCB-ACH:ODH-O2iM-3:ODHAlarm",
+ "HCB-ACH:ODH-O2iM-4:O2Level",
+ "HCB-ACH:ODH-O2iM-4:ODHWarning",
+ "HCB-ACH:ODH-O2iM-4:ODHAlarm",
+ "HCB-ACH:ODH-O2iM-5:O2Level",
+ "HCB-ACH:ODH-O2iM-5:ODHWarning",
+ "HCB-ACH:ODH-O2iM-5:ODHAlarm",
+ "HCB-TCH:ODH-O2iM-6:O2Level",
+ "HCB-TCH:ODH-O2iM-6:ODHWarning",
+ "HCB-TCH:ODH-O2iM-6:ODHAlarm",
+ "HCB-TCH:ODH-O2iM-7:O2Level",
+ "HCB-TCH:ODH-O2iM-7:ODHWarning",
+ "HCB-TCH:ODH-O2iM-7:ODHAlarm",
+ "HCB-TCH:ODH-O2iM-8:O2Level",
+ "HCB-TCH:ODH-O2iM-8:ODHWarning",
+ "HCB-TCH:ODH-O2iM-8:ODHAlarm",
+ "HCB-TCH:ODH-O2iM-9:O2Level",
+ "HCB-TCH:ODH-O2iM-9:ODHWarning",
+ "HCB-TCH:ODH-O2iM-9:ODHAlarm",
+ "HCB-HPGS:ODH-O2iM-10:O2Level",
+ "HCB-HPGS:ODH-O2iM-10:ODHWarning",
+ "HCB-HPGS:ODH-O2iM-10:ODHAlarm",
+ "HCB-HPGS:ODH-O2iM-11:O2Level",
+ "HCB-HPGS:ODH-O2iM-11:ODHWarning",
+ "HCB-HPGS:ODH-O2iM-11:ODHAlarm",
+ "HCB-HPGS:ODH-O2iM-12:O2Level",
+ "HCB-HPGS:ODH-O2iM-12:ODHWarning",
+ "HCB-HPGS:ODH-O2iM-12:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-13:O2Level",
+ "CXB-CXH:ODH-O2iM-13:ODHWarning",
+ "CXB-CXH:ODH-O2iM-13:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-14:O2Level",
+ "CXB-CXH:ODH-O2iM-14:ODHWarning",
+ "CXB-CXH:ODH-O2iM-14:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-15:O2Level",
+ "CXB-CXH:ODH-O2iM-15:ODHWarning",
+ "CXB-CXH:ODH-O2iM-15:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-16:O2Level",
+ "CXB-CXH:ODH-O2iM-16:ODHWarning",
+ "CXB-CXH:ODH-O2iM-16:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-17:O2Level",
+ "CXB-CXH:ODH-O2iM-17:ODHWarning",
+ "CXB-CXH:ODH-O2iM-17:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-18:O2Level",
+ "CXB-CXH:ODH-O2iM-18:ODHWarning",
+ "CXB-CXH:ODH-O2iM-18:ODHAlarm",
+ "CXB-CXH:ODH-O2iM-19:O2Level",
+ "CXB-CXH:ODH-O2iM-19:ODHWarning",
+ "CXB-CXH:ODH-O2iM-19:ODHAlarm",
+ "CTLG-CS:ODH-O2iM-20:O2Level",
+ "CTLG-CS:ODH-O2iM-20:ODHWarning",
+ "CTLG-CS:ODH-O2iM-20:ODHAlarm",
+ "CTLG-CS:ODH-O2iM-21:O2Level",
+ "CTLG-CS:ODH-O2iM-21:ODHWarning",
+ "CTLG-CS:ODH-O2iM-21:ODHAlarm",
+ "CTLG-CS:ODH-O2iM-22:O2Level",
+ "CTLG-CS:ODH-O2iM-22:ODHWarning",
+ "CTLG-CS:ODH-O2iM-22:ODHAlarm",
+ "KG-GTA:ODH-O2iM-1:O2Level",
+ "KG-GTA:ODH-O2iM-1:ODHWarning",
+ "KG-GTA:ODH-O2iM-1:ODHAlarm",
+ "KG-GTA:ODH-O2iM-2:O2Level",
+ "KG-GTA:ODH-O2iM-2:ODHWarning",
+ "KG-GTA:ODH-O2iM-2:ODHAlarm",
+ ]
epics_dict = {}
for pv in pvs:
@@ -44,13 +94,13 @@ class odhScreen(Thread):
try:
json_dict = {}
for pv in epics_dict:
- if 'Level' in pv:
+ if "Level" in pv:
json_dict[pv] = {}
status = False
if epics_dict[pv].connected:
json_dict[pv]["units"] = epics_dict[pv].units
json_dict[pv]["timestamp"] = epics_dict[pv].timestamp
- json_dict[pv]['status'] = 0
+ json_dict[pv]["status"] = 0
value = epics_dict[pv].value
if type(value) == float:
json_dict[pv]["value"] = round(value, 3)
@@ -60,17 +110,21 @@ class odhScreen(Thread):
json_dict[pv]["units"] = "n.c."
json_dict[pv]["timestamp"] = ""
json_dict[pv]["value"] = "Offline"
- json_dict[pv]['status'] = 0
+ json_dict[pv]["status"] = 0
status = False
- if epics_dict[pv[0:-6]+'DHWarning'].connected:
- json_dict[pv]['status'] += epics_dict[pv[0:-6]+'DHWarning'].value
+ if epics_dict[pv[0:-6] + "DHWarning"].connected:
+ json_dict[pv]["status"] += epics_dict[
+ pv[0:-6] + "DHWarning"
+ ].value
status = True
- if epics_dict[pv[0:-6]+'DHAlarm'].connected:
- json_dict[pv]['status'] += epics_dict[pv[0:-6]+'DHAlarm'].value
+ if epics_dict[pv[0:-6] + "DHAlarm"].connected:
+ json_dict[pv]["status"] += epics_dict[
+ pv[0:-6] + "DHAlarm"
+ ].value
status = True
if not status:
- json_dict[pv]['status'] = 3
+ json_dict[pv]["status"] = 3
tmp_json = json.dumps(json_dict)
tmp_json = tmp_json.replace("NaN", "0")