From 615abac420fddbdbcfb345f1c31811acec2d5205 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 14 Sep 2026 12:31:30 +0200 Subject: [PATCH 1/5] Raster suffixes _raster2d and _raster1d --- src/aare/daq/operations/raster/service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/operations/raster/service.py b/src/aare/daq/operations/raster/service.py index 3e5b47a8..31129448 100644 --- a/src/aare/daq/operations/raster/service.py +++ b/src/aare/daq/operations/raster/service.py @@ -686,7 +686,7 @@ class RasterService: grid.grid_size_mm = r.grid_size_mm grid.n_x = r.n_x grid.n_y = r.n_y - grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg" + grid.file_prefix = f"{old_prefix}_raster2d" grid.omega_deg = geom.omega_deg status = self.ctx.status @@ -722,7 +722,7 @@ class RasterService: self.ctx.deps.devs.aerotech_omega = grid.omega_deg grid.n_x = 1 - grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg" + grid.file_prefix = f"{old_prefix}_raster1d" geom = self.ctx.sample_geometry grid.grid_size_mm = Coordinate(x=geom.beam_size_mm.x, y=geom.beam_size_mm.y * 0.25) grid.smargon_top_left, grid.n_y = self.auto_center_line_scan_top_left( @@ -747,7 +747,7 @@ class RasterService: ) status = self.ctx.status - self.logger.info(f"initialise detector for raster at {grid.omega_deg}") + self.logger.info(f"initialise detector for raster at {grid.omega_deg:.2f}") self.ctx.deps.jfjoch.measure_raster(grid, status) self.logger.info("detector initialised") -- 2.54.0 From ec0167f0a56144d21c008bebe3567c74a0376baf Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 14 Sep 2026 12:37:30 +0200 Subject: [PATCH 2/5] Add goniometer omega to raster scan --- src/aare/devices/jfjoch.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 2d6d49fa..7cc07841 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -201,6 +201,8 @@ class JFJochWrapper: detect_ice_rings=True, async_start=async_start, smargon=smargon_phi_chi, + #beam_size_x_um=s.diffraction.beam_size_x, + #beam_size_y_um=s.diffraction.beam_size_y, ) # settup grid or goniometer settings adn add to dataset settings @@ -212,8 +214,15 @@ class JFJochWrapper: step_y_um=r.grid_size_mm.y * 1000.0, vertical=False, ) + goniometer_settings = jfjoch_client.RotationAxis( + step=0, + start=r.omega_deg, + name="omega", + vector=[-1, 0, 0], + screening_wedge_deg=0, + ) dataset_settings.grid_scan = grid_settings - + dataset_settings.goniometer = goniometer_settings else: goniometer_settings = jfjoch_client.RotationAxis( step=r.incr_omega_deg, -- 2.54.0 From 33a98abd7a39552ac5e6b43aac3967f2a923b735 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 14 Sep 2026 12:41:31 +0200 Subject: [PATCH 3/5] Add beam size to Jungfraujoch --- src/aare/devices/jfjoch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 7cc07841..22eca973 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -201,8 +201,8 @@ class JFJochWrapper: detect_ice_rings=True, async_start=async_start, smargon=smargon_phi_chi, - #beam_size_x_um=s.diffraction.beam_size_x, - #beam_size_y_um=s.diffraction.beam_size_y, + beam_size_x_um=s.geom.beam_size_mm.x * 1000.0, + beam_size_y_um=s.geom.beam_size_mm.y * 1000.0, ) # settup grid or goniometer settings adn add to dataset settings -- 2.54.0 From b0f7bd151ce7d71b4c38338839f166d08a5f9e30 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 14 Sep 2026 12:44:04 +0200 Subject: [PATCH 4/5] Add polarization factor to Jungfraujoch --- src/aare/devices/jfjoch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 22eca973..973a4e01 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -203,6 +203,7 @@ class JFJochWrapper: smargon=smargon_phi_chi, beam_size_x_um=s.geom.beam_size_mm.x * 1000.0, beam_size_y_um=s.geom.beam_size_mm.y * 1000.0, + polarization_factor=1.0 ) # settup grid or goniometer settings adn add to dataset settings -- 2.54.0 From 814290829dd403238d6f239f329a421978d0888e Mon Sep 17 00:00:00 2001 From: David Perl Date: Mon, 14 Sep 2026 12:44:58 +0200 Subject: [PATCH 5/5] style: format --- src/aare/devices/jfjoch.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/aare/devices/jfjoch.py b/src/aare/devices/jfjoch.py index 973a4e01..4de214f2 100644 --- a/src/aare/devices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -203,7 +203,7 @@ class JFJochWrapper: smargon=smargon_phi_chi, beam_size_x_um=s.geom.beam_size_mm.x * 1000.0, beam_size_y_um=s.geom.beam_size_mm.y * 1000.0, - polarization_factor=1.0 + polarization_factor=1.0, ) # settup grid or goniometer settings adn add to dataset settings @@ -216,11 +216,7 @@ class JFJochWrapper: vertical=False, ) goniometer_settings = jfjoch_client.RotationAxis( - step=0, - start=r.omega_deg, - name="omega", - vector=[-1, 0, 0], - screening_wedge_deg=0, + step=0, start=r.omega_deg, name="omega", vector=[-1, 0, 0], screening_wedge_deg=0 ) dataset_settings.grid_scan = grid_settings dataset_settings.goniometer = goniometer_settings -- 2.54.0