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

src/aare/devices/jfjoch.py

@@ -201,6 +201,9 @@ class JFJochWrapper:
             detect_ice_rings=True,
             async_start=async_start,
             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
@@ -212,8 +215,11 @@ 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,