Clean up data_to_array to not use get attr

This commit is contained in:
Joe Knapper 2026-05-13 13:03:40 +01:00 committed by jaknapper
parent 563bfcf7be
commit b1791833e2

View file

@ -454,14 +454,18 @@ class JPEGSharpnessMonitor:
def data_to_array(self) -> SharpnessDataArrays:
"""Return the gathered data as SharpnessDataArrays."""
data = {}
for k in [
"jpeg_times",
"jpeg_sizes",
"stage_times",
"focus_foms",
"stage_positions",
]:
data[k] = getattr(self, k)
data["jpeg_times"] = self._jpeg_times
data["stage_times"] = self._stage_times
data["stage_positions"] = self._stage_positions
if self.record & SharpnessMethod.JPEG:
data["jpeg_sizes"] = self._jpeg_sizes
if self.record & SharpnessMethod.FOCUS_FOM:
data["focus_foms"] = self._focus_foms
else:
data["focus_foms"] = []
return SharpnessDataArrays(**data)
def data_dict(self) -> dict: