From c41ed720408c9af717bbd65db4ce3800bb3fde05 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Tue, 30 Jul 2024 10:44:37 +0200
Subject: [PATCH] refactor: apply suggested code improvement
---
.../Gotthard2/Correction_Gotthard2_NBC.ipynb | 4 +---
src/cal_tools/gotthard2/gotthard2lib.py | 22 +++++++++++--------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
index a424d7f31..c70f1b709 100644
--- a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
@@ -241,9 +241,7 @@
" db_modules = [da_to_pdu[da] for da in karabo_da]\n",
"\n",
"print(f\"Process modules: {db_modules} for run {run}\")\n",
- "if len(input_source_affixes) != len(karabo_da):\n",
- " raise ValueError(\n",
- " \"receiver_affixes & karabo_da are not the same length\")\n",
+ "\n",
"\n",
"da_to_source = gotthard2lib.map_da_to_source(\n",
" run_dc,\n",
diff --git a/src/cal_tools/gotthard2/gotthard2lib.py b/src/cal_tools/gotthard2/gotthard2lib.py
index 51f1e6118..f828f3541 100644
--- a/src/cal_tools/gotthard2/gotthard2lib.py
+++ b/src/cal_tools/gotthard2/gotthard2lib.py
@@ -6,15 +6,19 @@ import extra_data
def map_da_to_source(dc, das, source_template, karabo_id, affixes):
- da_to_source = {}
- for da, aff in zip(das, affixes):
- sources = dc.select(
- f"*{source_template.format(karabo_id=karabo_id, input_source_affixes=aff)}").all_sources # noqa
- if len(sources) != 1:
- raise ValueError(f"No/multiple sources found for {aff!r}")
- da_to_source[da] = list(sources)[0]
-
- return da_to_source
+ source_names = [
+ f"{source_template.format(karabo_id=karabo_id, input_source_affixes=aff)}" # noqa
+ for aff in affixes
+ ]
+ if len(source_names) != len(das):
+ raise ValueError(
+ "Number of source names (and given affixes) "
+ "does not match number of DAs")
+ missing_sources = set(source_names) - dc.instrument_sources
+ if missing_sources:
+ raise ValueError(
+ f"The following sources are missing from the run: {missing_sources}")
+ return dict(zip(das, source_names))
class Gotthard2Ctrl():
--
GitLab