From bb258321b3c4b390d8707cdf143b34b165d453d9 Mon Sep 17 00:00:00 2001
From: Emanuele Laface <ema@morla.esss.lu.se>
Date: Mon, 10 Feb 2020 16:42:31 +0100
Subject: [PATCH] Removed the BCM correction 15/8
---
PythonServer/pos-python-server.py | 6 ++----
PythonServer/screens/pos.py | 4 +---
WebSites/pvs/dashboard.json | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/PythonServer/pos-python-server.py b/PythonServer/pos-python-server.py
index 84a48c0..94f0b23 100755
--- a/PythonServer/pos-python-server.py
+++ b/PythonServer/pos-python-server.py
@@ -24,8 +24,6 @@ pv_repo = os.environ.get('PV_REPO', 'https://bitbucket.org/europeanspallationsou
stop_signal = Event()
stop_signal.clear()
-bcm_correction=15/8
-
try:
Repo.clone_from(pv_repo, './repo')
pvfiles=glob('./repo/*.txt')
@@ -128,7 +126,7 @@ class myHandler(BaseHTTPRequestHandler):
try:
if path[1]=='ISrc-010:PBI-BCM-001:AI4-Compressed-Mean':
myPV=epics.PV('ISrc-010:PBI-BCM-001:AI4-Compressed', auto_monitor=True)
- mean_value=myPV.value.mean()*bcm_correction
+ mean_value=myPV.value.mean()
tmp_info = myPV.info.split('\n')
tmp_info[0]='== ISrc-010:PBI-BCM-001:AI4-Compressed-Mean (time_double) =='
tmp_info[1]=' value = '+str(mean_value)
@@ -149,7 +147,7 @@ class myHandler(BaseHTTPRequestHandler):
return
if path[1]=='ISrc-010:PBI-BCM-001:AI4-Compressed-Max':
myPV=epics.PV('ISrc-010:PBI-BCM-001:AI4-Compressed', auto_monitor=True)
- max_value=myPV.value.max()*bcm_correction
+ max_value=myPV.value.max()
tmp_info = myPV.info.split('\n')
tmp_info[0]='== ISrc-010:PBI-BCM-001:AI4-Compressed-Max (time_double) =='
tmp_info[1]=' value = '+str(max_value)
diff --git a/PythonServer/screens/pos.py b/PythonServer/screens/pos.py
index 6847b76..bceed7e 100755
--- a/PythonServer/screens/pos.py
+++ b/PythonServer/screens/pos.py
@@ -16,8 +16,6 @@ class posScreen(Thread):
for pv in pvs:
epics_dict[pv]=epics.PV(pv, auto_monitor=True)
- bcm_correction=15/8
-
while(not self.stop_signal.isSet()):
json_dict={}
for pv in epics_dict:
@@ -25,7 +23,7 @@ class posScreen(Thread):
if epics_dict[pv].connected:
json_dict[pv]['units']=epics_dict[pv].units
if pv=='ISrc-010:PBI-BCM-001:AI4-Compressed':
- y_data_array=epics_dict[pv].value*bcm_correction
+ y_data_array=epics_dict[pv].value
y_data=list(y_data_array)
x_data_array=linspace(0,12.8,len(y_data))
x_data=list(x_data_array)
diff --git a/WebSites/pvs/dashboard.json b/WebSites/pvs/dashboard.json
index fa765e8..89dfa34 100644
--- a/WebSites/pvs/dashboard.json
+++ b/WebSites/pvs/dashboard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"header_image": "",
- "allow_edit": false,
+ "allow_edit": true,
"plugins": [],
"panes": [
{
--
GitLab