feat: bring daq into line with fractional transmission
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
This commit is contained in:
+5
-9
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user