From 56de526c1d46feab2c73d66cb7c163116906d83b Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Thu, 30 Jan 2020 15:24:40 +0100
Subject: [PATCH] add conf to request_darks.py
---
webservice/serve_overview.py | 4 +++-
webservice/serve_overview.yaml | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/webservice/serve_overview.py b/webservice/serve_overview.py
index 5875376d9..edcf71510 100644
--- a/webservice/serve_overview.py
+++ b/webservice/serve_overview.py
@@ -94,8 +94,10 @@ class RequestHandler(BaseHTTPRequestHandler):
return
host = config["server-config"]["host"]
port = config["server-config"]["port"]
+ req_dark = config["scrpts-cnf"]["req-dark"]
+ python_v = config["scrpts-cnf"]["python-v"]
if 'request_dark' in pars:
- par_list = ['python', 'request_darks.py', '--bkg']
+ par_list = [python_v, req_dark, '--bkg']
del pars["request_dark"]
for k, v in pars.items():
par_list.append('--{}'.format(str(k).replace("_", "-")))
diff --git a/webservice/serve_overview.yaml b/webservice/serve_overview.yaml
index 12984eb21..e0ba7cb53 100644
--- a/webservice/serve_overview.yaml
+++ b/webservice/serve_overview.yaml
@@ -53,6 +53,10 @@ server-config:
cal_db_interface: tcp://max-exfl016:8022
cal_db_timeout: 30000
+scrpts-cnf:
+ req-dark: request_darks.py
+ python-v: python
+
web-service:
job-db: ./webservice_jobs.sqlite
cal-config: /home/xcal/calibration_config/default.yaml
--
GitLab