From 13a42c98a38086b9aa77ce1b00b21643c419226b Mon Sep 17 00:00:00 2001 From: David Perl Date: Tue, 1 Sep 2026 15:10:36 +0200 Subject: [PATCH] feat: pass smargon phi and chi positions to jfjoch --- pyproject.toml | 2 +- src/aare/devices/jfjoch.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e2ad3c98..318ce07b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ "aarecommon>=0.5.1", "pydantic>=2.11", "numpy", - "jfjoch_client>=1.0.0rc146", + "jfjoch_client>=1.0.0rc165", "pyJWT", "pyzmq", "opencv-python-headless", diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 22c89b19..1324a0b7 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -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 -- 2.54.0