diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 71db8cc0..222b19ea 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1617,6 +1617,7 @@ class AareDAQ: params = SimpleScanParameters() + if (exp := getattr(aaredb_params, "exposure", None)) is not None: params.exp_time_s = exp @@ -1630,12 +1631,13 @@ class AareDAQ: new_res = 1 / ((1 / res) + 0.01) corrected_dtz = self.diffraction_geometry.calc_dtz_mm(new_res) logger.debug(f"corrected dtz: {corrected_dtz}") - if corrected_dtz < self._devs.dtz_low: - logger.warning( + params.dtz = round(corrected_dtz) + + if params.dtz < self._devs.dtz_low: + logger.warning( f"Detector distance based on desired resolution cannot be reached, using minimum of {self._devs.dtz_low}." ) - corrected_dtz = self._devs.dtz_low - params.dtz = round(corrected_dtz) + params.dtz = self._devs.dtz_low osc = getattr(aaredb_params, "oscillation", None) total = getattr(aaredb_params, "totalrange", None)