diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index fcee447d..6b2a5e87 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -502,7 +502,7 @@ class AareDAQ: return None - def __raster(self, r: RasterGridRequest) -> CompletedRasterGridElem: + def __raster(self, r: RasterGridRequest, corner_coord: bool) -> CompletedRasterGridElem: max_time = r.exp_time_s * r.n_y * r.n_x + 60 if r.dtz is not None: @@ -512,10 +512,7 @@ class AareDAQ: save_smargon_position = self.__devs.smargon.readback - if r.n_x > 1: - delta_mm = self.sample_geometry.smargon_nudge(Coordinate(x=0, y=r.grid_size_mm.y / 2)) - else: - delta_mm = self.sample_geometry.smargon_nudge(Coordinate(x=r.grid_size_mm.x / 2, y=0)) + delta_mm = self.sample_geometry.smargon_nudge(Coordinate(x=r.grid_size_mm.x / 2, y=r.grid_size_mm.y / 2)) self.__devs.smargon.target = SmargonCoordinate(sh_mm=r.smargon.sh_mm + delta_mm, phi_deg=r.smargon.phi_deg, @@ -567,7 +564,7 @@ class AareDAQ: json.dump(output_data, f, indent=2) result_array = create_quality_filtered_array(images, 'spots_low_res', min_spots=None, - min_efficiency=1.0, min_background=None, min_low_res_spots=10.0) + min_efficiency=1.0, min_background=None, min_low_res_spots=None) self.__cfg.crystal_size = get_xtal_size(self.__cfg.crystal_size, result_array, r) grid_mm_x, grid_mm_y, com = raster_centre_of_mass(result_array, r) @@ -607,7 +604,7 @@ class AareDAQ: if auto: result = self.__auto_center(r) else: - raster_result = self.__raster(r) + raster_result = self.__raster(r, True) result = CompletedRasterGrid(r=[raster_result]) self.__devs.reflector_up = True time.sleep(0.1)