From 19d5740c1f27fef23b0a113cd250d82bb76754a4 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 1 Oct 2025 17:06:43 +0200 Subject: [PATCH] diffraction_geometry: updated resolution and det_dist calculation to use theta not 2theta --- daq/src/mxlibs3/jfjoch.py | 6 +++++- gui/src/aaregui/main_window.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/daq/src/mxlibs3/jfjoch.py b/daq/src/mxlibs3/jfjoch.py index 47d0f0c8..68a82e9c 100644 --- a/daq/src/mxlibs3/jfjoch.py +++ b/daq/src/mxlibs3/jfjoch.py @@ -77,7 +77,11 @@ class JFJochWrapper: transmission=s.bl.transmission, ring_current_mA=s.bl.ring_current_mA, sample_temperature_K=s.bl.cryojet_K, - total_flux=s.bl.flux_ph_s + poni_rot1_rad=s.diffraction.poni_rot1_rad, + poni_rot2_rad=s.diffraction.poni_rot2_rad, + total_flux=s.bl.flux_ph_s, + max_spot_count=1000, + detect_ice_rings=True ) self.__api.start_post(dataset_settings=dataset_settings) diff --git a/gui/src/aaregui/main_window.py b/gui/src/aaregui/main_window.py index eca43739..62677345 100644 --- a/gui/src/aaregui/main_window.py +++ b/gui/src/aaregui/main_window.py @@ -65,7 +65,9 @@ class MainWindow(QMainWindow): pixel_size_mm=0.150, #PILATUS 4 beam_center_pxl=(750, 750), detector_description="PILATUS 4", - detector_serial_number="1" + detector_serial_number="1", + poni_rot1_rad=0, + poni_rot2_rad=0 ) geom = SampleGeometryModel(beam_location_pxl=Coordinate(x=1000,y=1000),