feat: pass smargon phi and chi positions to jfjoch
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 (pull_request) Successful in 29s
CI / test (3.13) (pull_request) Failing after 41s
CI / test (3.14) (pull_request) Failing after 41s
CI / test (3.12) (pull_request) Failing after 1m28s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Failing after 44s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Failing after 1m30s
CI / test-with-coverage (pull_request) Failing after 1m33s
CI / coverage-analysis (pull_request) Skipped
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Failing after 2m5s

This commit is contained in:
2026-09-01 15:10:36 +02:00
parent 8cb6ff1828
commit 67f9bb198b
+8
View File
@@ -15,6 +15,7 @@ from aarecommon.models.raster_grid import RasterGridRequest
from aarecommon.models.rotation_scan import RotationScanRequest
from jfjoch_client.api.default_api import DefaultApi
from jfjoch_client.api_client import ApiClient
from jfjoch_client.models.dataset_settings_smargon import DatasetSettingsSmargon
from jfjoch_client.models.detector_list_element import DetectorListElement
from jfjoch_client.models.scan_result import ScanResult
@@ -171,6 +172,12 @@ class JFJochWrapper:
"must validate and set request.dtz before JFJoch is configured"
)
# build common dataset settings
if s.geom.smargon.phi_deg is not None and s.geom.smargon.chi_deg is not None:
smargon_phi_chi = DatasetSettingsSmargon(
phi_deg=s.geom.smargon.phi_deg, chi_deg=s.geom.smargon.chi_deg
)
else:
smargon_phi_chi = None
dataset_settings = jfjoch_client.DatasetSettings(
beam_x_pxl=s.diffraction.beam_center_pxl[0],
beam_y_pxl=s.diffraction.beam_center_pxl[1],
@@ -191,6 +198,7 @@ class JFJochWrapper:
max_spot_count=1000,
detect_ice_rings=True,
async_start=async_start,
smargon=smargon_phi_chi,
)
# settup grid or goniometer settings adn add to dataset settings