From a2468a67c1216a6978e1997acb89852e5f0a8738 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Tue, 10 Oct 2023 16:35:41 +0200
Subject: [PATCH] flake8
---
src/cal_tools/agipdlib.py | 38 +++++++++-----------------------------
1 file changed, 9 insertions(+), 29 deletions(-)
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index b8491ff4b..29879a1ea 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -335,7 +335,7 @@ class AgipdCtrlRuns:
def sort_dark_runs(self):
"""Order dark runs based on PatternTypeIndex."""
- assert len(self.runs) == 3, f"AGIPD dark runs are expected to be 3. {len(self.runs)} runs are given."
+ assert len(self.runs) == 3, f"AGIPD dark runs are expected to be 3. {len(self.runs)} runs are given." # noqa
# Expected patterns:
# XRay: 0, DarkHG: 1, DarkMG: 2, DarkLG: 3, PC: 4 and CS: 5.
sort_by = {}
@@ -357,42 +357,22 @@ class AgipdCtrlRuns:
raise ValueError(
f"Given runs {self.runs} have a mix of ADAPTIVE and "
f"FIXED gain modes: {self.gain_modes}.")
- else: # Fixed gain: Patterns is X-Ray: 0 for all runs.
+ else: # Fixed gain: Patterns is X-Ray: 0 for all runs.
sort_by["gainModeIndex"] = [int(gm) for gm in self.gain_modes]
- zipped_lists = zip(list(sort_by.values())[0], self.runs, self.run_ctrls)
+ zipped_lists = zip(
+ list(sort_by.values())[0], self.runs, self.run_ctrls)
# Sort the lists based on the patterns
sorted_zipped_lists = sorted(zipped_lists, key=lambda item: item[0])
_, sorted_runs, sorted_run_ctrls = zip(*sorted_zipped_lists)
if sorted_runs != self.runs:
Warning("Given dark runs are unsorted. Runs will be sorted from"
- f" {self.runs} with {list(sort_by.keys())[0]} {list(sort_by.values())} to "
- f" {sorted_runs}.")
- # Update run_ctrls and runs order
- self.runs = sorted_runs
- self.run_ctrls = sorted_run_ctrls
-
- def validate_gain_modes(self):
- """Validate the runs' gain modes arrangement.
-
- Raises:
- ValueError: Runs are a mix of adaptive and fixed gains
- ValueError: Unexpected gain modes for the dark runs"""
- if self.gain_modes in [
- self.adaptive_gain_modes,
- self.fixed_gain_modes
- ]:
- return # all good.
- # Check if a mix of adaptive and fixed gain runs.
- if any(gm == AgipdGainMode.ADAPTIVE_GAIN for gm in self.gain_modes):
- raise ValueError(
- f"Given runs {self.runs} have a mix of ADAPTIVE and "
- f"FIXED gain modes: {self.gain_modes}.")
- else: # Unsorted fixed gain runs.
- raise ValueError(
- "Wrong arrangement of given dark runs. Given runs' "
- f"gain_modes are {self.gain_modes} for runs: {self.runs}.")
+ f" {self.runs} with {list(sort_by.keys())[0]}"
+ f" {list(sort_by.values())} to {sorted_runs}.")
+ # Update run_ctrls and runs order
+ self.runs = list(sorted_runs)
+ self.run_ctrls = list(sorted_run_ctrls)
def fixed_gain_mode(self):
"""Check if runs are in fixed gain mode.
--
GitLab