fix: truncate detector distance parameter calculation at soft limit
CI / lint (pull_request) Successful in 35s
CI / test (3.12) (pull_request) Successful in 1m4s
CI / test (3.11) (pull_request) Successful in 1m9s
CI / test (3.13) (pull_request) Successful in 1m10s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m18s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m33s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m15s
CI / test-with-coverage (pull_request) Successful in 1m26s
CI / lint (push) Successful in 40s
CI / test (3.11) (push) Successful in 1m6s
CI / test (3.12) (push) Successful in 1m6s
Docs build and publish / docker (push) Successful in 6s
CI / test (3.13) (push) Successful in 1m7s
CI / coverage-analysis (pull_request) Failing after 4s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 56s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 39s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 26s
CI / test-with-coverage (push) Canceled after 16s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 12s
CI / lint (pull_request) Successful in 35s
CI / test (3.12) (pull_request) Successful in 1m4s
CI / test (3.11) (pull_request) Successful in 1m9s
CI / test (3.13) (pull_request) Successful in 1m10s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m18s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m33s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m15s
CI / test-with-coverage (pull_request) Successful in 1m26s
CI / lint (push) Successful in 40s
CI / test (3.11) (push) Successful in 1m6s
CI / test (3.12) (push) Successful in 1m6s
Docs build and publish / docker (push) Successful in 6s
CI / test (3.13) (push) Successful in 1m7s
CI / coverage-analysis (pull_request) Failing after 4s
CI / test-with-beamline-plugins (pxi_bec) (push) Canceled after 56s
CI / test-with-beamline-plugins (pxii_bec) (push) Canceled after 39s
CI / test-with-beamline-plugins (pxiii_bec) (push) Canceled after 26s
CI / test-with-coverage (push) Canceled after 16s
CI / coverage-analysis (push) Canceled after 0s
Build and Publish / release (push) Successful in 12s
This commit was merged in pull request #160.
This commit is contained in:
1 parent
0f5b568a6e
commit
a6ad306849
1 file changed
+6
-2
+6
-2
@@ -1627,10 +1627,14 @@ class AareDAQ:
|
||||
if (res := getattr(aaredb_params, "targetresolution", None)) is not None:
|
||||
logger.debug(f"resolution: {res}")
|
||||
logger.debug(f"requested dtz: {self.diffraction_geometry.calc_dtz_mm(res)} ")
|
||||
new_res = 1 / ((1 / res) + 0.1)
|
||||
new_res = 1 / ((1 / res) + 0.01)
|
||||
corrected_dtz = self.diffraction_geometry.calc_dtz_mm(new_res)
|
||||
logger.debug(f"corrected dtz: {corrected_dtz}")
|
||||
corrected_dtz = max(corrected_dtz, 108)
|
||||
if corrected_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)
|
||||
|
||||
osc = getattr(aaredb_params, "oscillation", None)
|
||||
|
||||
Reference in new issue
Block a user