From ae683cf44f77a51ddd040c496706309f544e382f Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 29 Jan 2024 12:40:01 +0100
Subject: [PATCH] move lits of three gain/run detectors into webservice config
yaml
---
webservice/config/webservice.yaml | 12 ++++++++++++
webservice/webservice.py | 13 +------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml
index 0e23f1ca8..3888f36cc 100644
--- a/webservice/config/webservice.yaml
+++ b/webservice/config/webservice.yaml
@@ -73,3 +73,15 @@ dark:
--report-to {reports_folder}/{action}_{proposal}_{runs}_{time_stamp}
--cal-db-interface tcp://max-exfl-cal001:8015#8044
--db-output
+ three-gain-detectors:
+ [
+ "LPD",
+ "AGIPD",
+ "JUNGFRAU",
+ "JF",
+ "JNGFR",
+ "JUNGF",
+ "GH2",
+ "G2",
+ "HIREX",
+ ]
diff --git a/webservice/webservice.py b/webservice/webservice.py
index d1a6cafc9..0e53747df 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -1287,18 +1287,7 @@ class ActionsServer:
# Notebooks require one or three runs, depending on the
# detector type and operation mode.
triple = any(
- det in karabo_id for det in
- [
- "LPD",
- "AGIPD",
- "JUNGFRAU",
- "JF",
- "JNGFR",
- "JUNGF",
- "GH2",
- "G2",
- "HIREX"
- ])
+ det in karabo_id for det in config['dark']['three-gain-detectors']) # noqa
# This fails silently if the hardcoded strings above are
# ever changed (triple = False) but the underlying notebook
--
GitLab