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",

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