]> jspc29.x-matter.uni-frankfurt.de Git - mvd_epics.git/commitdiff
DASH: serve complete local state together with history
authorPhilipp Klaus <klaus@physik.uni-frankfurt.de>
Tue, 12 Sep 2017 16:24:29 +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 661cc2c1c72ffe54ebc1d290c0aa4f27e115c8f0..751656ddf8c4342ff3403e5e004d435ffce5f261 100755 (executable)
@@ -201,8 +201,11 @@ def api_history(name):
     for row in history:
         row[0] *= 1000.
     pv_index = CONFIG['PV_lookup'][name]
-    precision = CONFIG['PVs'][pv_index]['precision']
-    return {'history': history, 'precision': precision}
+    pv = CONFIG['PVs'][pv_index]
+    precision = pv['precision']
+    ret_dict = {'history': history}
+    ret_dict.update(pv)
+    return ret_dict
 
 @route('/static/<path:path>')
 def static_content(path):