From 2f501f148e8afefc88a7181d170ee1bf83327637 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Wed, 2 Aug 2023 13:02:05 +0200
Subject: [PATCH] Some fixes
---
src/cal_tools/calcat_interface2.py | 4 ++--
tests/test_calcat_interface2.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/cal_tools/calcat_interface2.py b/src/cal_tools/calcat_interface2.py
index ede5a89ca..456f85517 100644
--- a/src/cal_tools/calcat_interface2.py
+++ b/src/cal_tools/calcat_interface2.py
@@ -130,7 +130,7 @@ class CalibrationData(Mapping):
cal_id_map = {
api.calibration_id(calibration): calibration
- for calibration in calibrations
+ for calibration in cal_types
}
calibration_ids = list(cal_id_map.keys())
@@ -153,7 +153,7 @@ class CalibrationData(Mapping):
res = cls(d)
if modules:
- res = res.select_modules(modules)
+ res = res.select_modules(*modules)
return res
@classmethod
diff --git a/tests/test_calcat_interface2.py b/tests/test_calcat_interface2.py
index dc9be2ec1..9897f0a8f 100644
--- a/tests/test_calcat_interface2.py
+++ b/tests/test_calcat_interface2.py
@@ -20,9 +20,10 @@ def test_AGIPD_CalibrationData_metadata():
)
agipd_cd = CalibrationData.from_condition(
cond,
- "SPB_DET_AGIPD1M-1",
+ "MID_DET_AGIPD1M-1",
event_at="2022-09-01 13:26:48.00",
modules=['AGIPD00'],
+ calibrations=['Offset', 'SlopesFF'],
)
assert 'Offset' in agipd_cd
assert set(agipd_cd['Offset'].constants) == {'AGIPD00'}
--
GitLab