From 94ede54fc8dc24c1a9e91f88f13d511fe21c68ee Mon Sep 17 00:00:00 2001 From: David Perl Date: Tue, 8 Sep 2026 09:07:26 +0200 Subject: [PATCH 1/2] feat: bring daq into line with fractional transmission --- src/aare/daq/daq.py | 14 +++++--------- src/aare/gui/panels/scan_settings_panel.py | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index a9adf94e..b15f16d7 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1631,7 +1631,7 @@ class AareDAQ: if (trans := getattr(aaredb_params, "transmission", None)) is not None: logger.debug(f"transmission: {trans}") - params.transmission = trans / 100.0 if trans > 1.0 else trans + params.transmission = trans if (res := getattr(aaredb_params, "targetresolution", None)) is not None: logger.debug(f"resolution: {res}") @@ -2490,18 +2490,14 @@ class AareDAQ: params = default_params - # Exposure exp = getattr(aaredb_params, "exposure", None) if exp is not None: params.exp_time_s = exp - else: - params.exp_time_s = 0.04 # Default - # Transmission - trans = getattr(aaredb_params, "transmission", None) - if trans is not None: - logger.debug(f"transmission: {trans}") - params.transmission = trans / 100.0 if trans > 1.0 else trans + db_transmission = getattr(aaredb_params, "transmission", None) + if db_transmission is not None: + logger.debug(f"DB provided transmission: {db_transmission}") + params.transmission = db_transmission else: params.transmission = 1.0 # Default diff --git a/src/aare/gui/panels/scan_settings_panel.py b/src/aare/gui/panels/scan_settings_panel.py index 65a5e6b1..9d7ed373 100644 --- a/src/aare/gui/panels/scan_settings_panel.py +++ b/src/aare/gui/panels/scan_settings_panel.py @@ -301,7 +301,7 @@ class ScanSettingsPanel(QWidget): # Handle transmission with conversion (common to all panels) if (transmission := getattr(self._params, "transmission", None)) is not None: - transmission_value = transmission / 100.0 if transmission > 1.0 else transmission + transmission_value = transmission self._transmission = transmission_value self.transmission_enter.set_db_value(transmission_value) -- 2.54.0 From deffc8b2cb3c23811ac1dac091f37e70f2de5b3c Mon Sep 17 00:00:00 2001 From: David Perl Date: Tue, 8 Sep 2026 09:09:33 +0200 Subject: [PATCH 2/2] fix: bump aarecommon dep --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fc1c765f..cf1d661a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ requires-python = ">=3.11" dependencies = [ "uv", "gunicorn", - "aarecommon>=0.5.1", + "aarecommon>=0.7.3", "pydantic>=2.11", "numpy", "jfjoch_client>=1.0.0rc165", -- 2.54.0