From 477d72a46cbd396ec7f4fd3428b548061d99cbd5 Mon Sep 17 00:00:00 2001 From: David Perl Date: Wed, 9 Sep 2026 18:03:10 +0200 Subject: [PATCH] style: format --- src/aare/daq/devices.py | 2 +- src/aare/gui/widgets/status_bar.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py index c5ad2d3b..4548af52 100644 --- a/src/aare/daq/devices.py +++ b/src/aare/daq/devices.py @@ -214,7 +214,7 @@ class BeamlineDevices: try: with suppress_output(): return self._dispatch.bec_macros.full_flux_ph_per_s() - except Exception as e: + except Exception as e: #noqa logger.error(f"Could not get flux from BEC macro {e}") return 9.99e12 diff --git a/src/aare/gui/widgets/status_bar.py b/src/aare/gui/widgets/status_bar.py index 9b88739d..1926ef8e 100644 --- a/src/aare/gui/widgets/status_bar.py +++ b/src/aare/gui/widgets/status_bar.py @@ -169,18 +169,17 @@ class StatusBar(QStatusBar): def update_daq_status(self, status: DAQStatusModel): try: self._status = status - if status.bl.flux_ph_s is None: + if status.bl.flux_ph_s is None or status.bl.transmission is None: self.flux.set_value("0") else: try: - num = f"{status.bl.flux_ph_s:.2E}" + num = f"{(status.bl.flux_ph_s / status.bl.transmission):.2E}" mod, exp = num.split("E") self.flux.set_value(f"{mod} x 10{int(exp)}") - except Exception as e: + except Exception as e: #noqa logger.error(f"Error parsing flux result: {e}") self.flux.set_value(f"{status.bl.flux_ph_s:.2E}") - if status.bl.transmission is None: self.transmission.set_value("(moving)") else: