diff --git a/src/cal_tools/lpdlib.py b/src/cal_tools/lpdlib.py index 9d6b19fe4643b542480fd998ffa65f0041c67fca..deb38f44b613e96570a2c10cd003ff54a23a6804 100644 --- a/src/cal_tools/lpdlib.py +++ b/src/cal_tools/lpdlib.py @@ -812,7 +812,7 @@ def make_cell_order_condition(use_param, cellid_pattern) -> Optional[str]: return (",".join([str(c) for c in cellid_pattern]) + ",") if use else None -def sort_sort_dark_runs_by_gain(raw_folder, runs, ctrl_src): +def sort_dark_runs_by_gain(raw_folder, runs, ctrl_src): """Check gain factors [100, 10, 1] to decide, if provided dark runs are in the correct order. diff --git a/tests/test_lpdlib.py b/tests/test_lpdlib.py index 5648c5c64b1a3632d44c5504ef54dfdf36451953..09a5d5530b228b514ceaa849f52f40b1b03a8bc0 100644 --- a/tests/test_lpdlib.py +++ b/tests/test_lpdlib.py @@ -19,9 +19,11 @@ def test_raise_sort_dark_runs_by_gain(): raw_folder = "/gpfs/exfel/exp/CALLAB/202130/p900203/raw" ctrl_src = "FXE_DET_LPD1M-1/COMP/FEM_MDL_COMP" runs = [9008, 9009] - with pytest.raises(AssertionError) as err: + with pytest.raises(AssertionError): # Only two runs provided sort_dark_runs_by_gain(raw_folder, runs, ctrl_src) - runs = [9008, 9008, 9009] # dynamicgain, dynamicgain, fixgain2 - with pytest.raises(ValueError) as err: + runs = [9008, 9008, 9009] # Same two runs provided + with pytest.raises(AssertionError): sort_dark_runs_by_gain(raw_folder, runs, ctrl_src) + + #TODO: Add a ValueError check when more LPD dark runs added in p900203