DAQ: Automation (WIP)

daq/src/aaredaq/aaredb.py

@@ -171,7 +171,7 @@ class AareWrapper:
                 model=d.diffraction.detector_description,
                 type="photon-counting",
                 serialNumber=d.diffraction.detector_serial_number,
-                detectorDistance_mm=r.dtz,
+                detectorDistance_mm=d.diffraction.dtz_mm,
                 beamCenterX_px=d.diffraction.beam_center_pxl[0],
                 beamCenterY_px=d.diffraction.beam_center_pxl[1],
                 pixelSizeX_um=d.diffraction.pixel_size_mm * 1000,
@@ -235,7 +235,7 @@ class AareWrapper:
                 model=d.diffraction.detector_description,
                 type="photon-counting",
                 serialNumber=d.diffraction.detector_serial_number,
-                detectorDistance_mm=r.dtz,
+                detectorDistance_mm=d.diffraction.dtz_mm,
                 beamCenterX_px=d.diffraction.beam_center_pxl[0],
                 beamCenterY_px=d.diffraction.beam_center_pxl[1],
                 pixelSizeX_um=d.diffraction.pixel_size_mm * 1000,

daq/src/aaredaq/daq.py

@@ -369,8 +369,6 @@ class AareDAQ:
             geom = self.sample_geometry
             grid.smargon.sh_mm = geom.smargon.sh_mm + geom.smargon_nudge(offset)
             res2 = self.__raster(grid)
-
-            self.__set_state(BeamlineStateEnum.SampleAlignment)
             return CompletedRasterGrid(r=[res1, res2])
         else:
             return None
@@ -795,7 +793,7 @@ class AareDAQ:
             self.__cfg.try_set_busy(timeout=360)
             geom = self.sample_geometry
             self.__mount(sample)
-
+            self.__loop_center_sequence(sample.db_id)
             self.__set_state(BeamlineStateEnum.SampleAlignment)
             self.__auto_center(RasterGridRequest(
                 exp_time_s=0.01,

daq/src/mxlibs3/jfjoch.py

@@ -67,7 +67,7 @@ class JFJochWrapper:
             beam_y_pxl=s.diffraction.beam_center_pxl[1],
             ntrigger= trigger,
             images_per_trigger=images,
-            detector_distance_mm=r.dtz,
+            detector_distance_mm=s.diffraction.dtz_mm,
             file_prefix=f"{pgroup}/raw/{r.file_prefix}",
             incident_energy_keV=s.diffraction.energy_keV,
             goniometer=goniometer_settings,