From f4623fa30cb8249ea1551eafe3c8387e2f32e366 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Mon, 21 Feb 2022 12:22:25 +0100
Subject: [PATCH] Log any detector skipped for corrections due to config
---
webservice/webservice.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index b1c010697..f26b99f24 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -910,11 +910,6 @@ class ActionsServer:
for karabo_id in pconf:
dconfig = data_conf[karabo_id]
- if dconfig.pop('disable-correct', False):
- # Skip this detector installation for
- # corrections if disabled.
- continue
-
# check for files according to mapping in raw run dir.
if any(y in x for x in fl
for y in dconfig['karabo-da']):
@@ -934,6 +929,13 @@ class ActionsServer:
Errors.REQUEST_FAILED)
return
+ for karabo_id in list(detectors.keys()):
+ # Check for any detectors for which corrections are
+ # disabled manually.
+ if detectors[karabo_id].pop('disable-correct', False):
+ logging.warning(f'Skipping disabled detector {karabo_id}')
+ del detectors[karabo_id]
+
if len(detectors) == 0:
msg = Errors.NOTHING_TO_DO.format(rpath)
logging.warning(msg)
--
GitLab