feat: bring daq into line with fractional transmission #202

Closed
perl_d wants to merge 2 commits from feat/update_transmission into main
3 changed files with 7 additions and 11 deletions
+1 -1
View File
@@ -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",
+5 -9
View File
@@ -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
+1 -1
View File
@@ -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)