diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 5f4c6a62..85518fa1 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -255,7 +255,12 @@ class AareDAQ: self.__set_state(BeamlineStateEnum.DataCollection) save_smargon_position = self.__devs.smargon.readback - self.__devs.smargon.target = r.smargon + + 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, + chi_deg=r.smargon.chi_deg) + self.__devs.transmission.set(r.transmission, wait=False) self.__devs.aerotech.move(r.omega_deg, wait=True, speed=360.0) self.__devs.transmission.wait() @@ -265,9 +270,12 @@ class AareDAQ: self.__jfjoch.measure_raster(r, status) self.__aare.create_gridscan_run(self.sample, r, status) - self.__devs.aerotech.measure_raster_simple( - r.exp_time_s, r.grid_size_mm.x, r.grid_size_mm.y, r.n_x, r.n_y - ) + if r.n_x == 1: + self.__devs.aerotech.measure_vertical_line(r.exp_time_s, r.grid_size_mm.y, r.n_y) + else: + self.__devs.aerotech.measure_raster_simple( + r.exp_time_s, r.grid_size_mm.x, r.grid_size_mm.y, r.n_x, r.n_y + ) self.__devs.aerotech.wait_scan_done(max_time) self.__devs.aerotech.reset() self.__devs.abr_pos = self.__cfg.abr_meas_pos diff --git a/daq/src/mxlibs3/aerotech.py b/daq/src/mxlibs3/aerotech.py index 7f156a75..69291d2d 100644 --- a/daq/src/mxlibs3/aerotech.py +++ b/daq/src/mxlibs3/aerotech.py @@ -462,7 +462,7 @@ class Abr: self._raster_num_rows = nrows self.start_command() - def measure_vertical_line(self, cellHeight, numCells, exposureTime): + def measure_vertical_line(self, exposureTime, cellHeight, numCells): """measure a vertical line using the GMY motor The line is nummCells * cellHeight long and the exposureTime is per cell. diff --git a/daq/src/mxlibs3/jfjoch.py b/daq/src/mxlibs3/jfjoch.py index 4fb03609..6faaf13d 100644 --- a/daq/src/mxlibs3/jfjoch.py +++ b/daq/src/mxlibs3/jfjoch.py @@ -90,6 +90,13 @@ class JFJochWrapper: pgroup = s.sample.user sample = s.sample.sample_name + if r.n_x == 1: + trigger = 1 + images = r.n_y + else: + trigger = r.n_y + images = r.n_x + grid_settings = jfjoch_client.GridScan( n_fast= r.n_x, snake=True, @@ -101,8 +108,8 @@ class JFJochWrapper: dataset_settings = jfjoch_client.DatasetSettings( beam_x_pxl=s.diffraction.beam_center_pxl[0], beam_y_pxl=s.diffraction.beam_center_pxl[1], - ntrigger= r.n_y, - images_per_trigger=r.n_x, + ntrigger= trigger, + images_per_trigger=images, detector_distance_mm=s.diffraction.dtz_mm, file_prefix=f"{pgroup}/raw/{r.file_prefix}", incident_energy_keV=s.diffraction.energy_keV,