From d27b666e93986aad47b81f22ba64bde25bfd26ec Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Fri, 13 Oct 2023 10:19:09 +0200
Subject: [PATCH] Fix the test and sort_dark_runs_enabled False by default
---
src/cal_tools/agipdlib.py | 2 +-
tests/test_agipdlib.py | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index c8ca6e653..909ca7cc1 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -308,7 +308,7 @@ class AgipdCtrlRuns:
runs: List[int]
image_src: str
ctrl_src: str
- sort_dark_runs_enabled: bool = True
+ sort_dark_runs_enabled: bool = False
adaptive_gain_modes = [AgipdGainMode.ADAPTIVE_GAIN] * 3
fixed_gain_modes = [
diff --git a/tests/test_agipdlib.py b/tests/test_agipdlib.py
index fed4b365d..b8d44ec1f 100644
--- a/tests/test_agipdlib.py
+++ b/tests/test_agipdlib.py
@@ -292,6 +292,7 @@ def test_raise_fixed_gain_mode():
with pytest.raises(ValueError):
adaptive_fixed_ctrls.fixed_gain_mode()
+
@pytest.mark.requires_gpfs
@pytest.mark.parametrize(
"runs,expected",
@@ -309,3 +310,23 @@ def test_sort_dark_runs(runs, expected):
)
runs_ctrls.sort_dark_runs()
assert runs_ctrls.runs == expected
+
+
+def test_raise_sort_dark_runs():
+ with pytest.raises(ValueError):
+ adaptive_fixed_ctrls = AgipdCtrlRuns(
+ raw_folder=TEST_RAW_FOLDER,
+ runs=[9011, 9016, 9017],
+ image_src=SPB_AGIPD_INST_SRC,
+ ctrl_src=CTRL_SRC,
+ sort_dark_runs_enabled=True
+ )
+
+ adaptive_fixed_ctrls = AgipdCtrlRuns(
+ raw_folder=TEST_RAW_FOLDER,
+ runs=[9011, 9016, 9017],
+ image_src=SPB_AGIPD_INST_SRC,
+ ctrl_src=CTRL_SRC,
+ )
+ with pytest.raises(ValueError):
+ adaptive_fixed_ctrls.sort_dark_runs()
\ No newline at end of file
--
GitLab