]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
DASH: add HOPR,LOPR,HIGH,LOW,HIHI,LOLO to local state
authorPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Tue, 12 Sep 2017 16:24:02 +0000 (18:24 +0200)
committerPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Tue, 12 Sep 2017 16:25:15 +0000 (18:25 +0200)
python_suite/dashboard/dashboard.py

index ff8d700ed7130f4d87e74453ff973487fc7a3711..661cc2c1c72ffe54ebc1d290c0aa4f27e115c8f0 100755 (executable)
@@ -103,6 +103,24 @@ def cb_value_update(**kwargs):
             pv['num_value'] = float('nan')
             pv['char_value'] = 'invalid'
         register_pv_value_in_history(kwargs['pvname'], kwargs['timestamp'], pv['num_value'])
+        if kwargs['upper_disp_limit'] != kwargs['lower_disp_limit']:
+            pv['upper_disp_limit'] = kwargs['upper_disp_limit']
+            pv['lower_disp_limit'] = kwargs['lower_disp_limit']
+        else:
+            pv['upper_disp_limit'] = float('nan')
+            pv['lower_disp_limit'] = float('nan')
+        if kwargs['upper_alarm_limit'] != kwargs['lower_alarm_limit']:
+            pv['upper_alarm_limit'] = kwargs['upper_alarm_limit']
+            pv['lower_alarm_limit'] = kwargs['lower_alarm_limit']
+        else:
+            pv['upper_alarm_limit'] = float('nan')
+            pv['lower_alarm_limit'] = float('nan')
+        if kwargs['upper_warning_limit'] != kwargs['lower_warning_limit']:
+            pv['upper_warning_limit'] = kwargs['upper_warning_limit']
+            pv['lower_warning_limit'] = kwargs['lower_warning_limit']
+        else:
+            pv['upper_warning_limit'] = float('nan')
+            pv['lower_warning_limit'] = float('nan')
         pv['precision'] = kwargs['precision']
         #if type(kwargs['precision']) == int and ('double' in kwargs['type'] or 'float' in kwargs['type']):
         #    pv['value'] = round(pv['value'], kwargs['precision'])