ec45bf37299640b4f65e0c34362c796c169bada5
The detector_distance_mm sent to JFJoch and written to the DB came from the live detector readback (diffraction.dtz_mm) captured before the detector finished moving, so a scan requested at e.g. 100 mm could be recorded at the old position (e.g. 800 mm). - JFJoch + DB now read the validated request target (request.dtz) instead of the live diffraction.dtz_mm; diffraction.dtz_mm stays live for the local-contact readout. - jfjoch: raise if request.dtz is unset (setup_datacollection must validate it first) instead of silently falling back to the live readback. - raster + rotation services: wait for the detector to reach request.dtz (set_dtz wait=True) right before triggering the scan, since the sa2dc move is non-blocking. (Raster setup-before-measure reorder landed earlier in daq.py.) - tests: request.dtz now required in jfjoch/aaredb tests; xtal-snapshot exposure assertion updated to 1 ms. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
AareDAQ (v0.3.1)
AareDAQ is the Data Acquisition system for MX beamlines at PSI.
GUI Controls Cheat Sheet
Sample Camera
Left click: move sample to clicked positionShift + Left click: Z-alignment click behaviourCtrl + Left clickon active raster grid: move to clicked position under the gridLeft dragon active raster grid: move active raster gridRight click: open sample camera context menuRight dragon empty area: draw raster gridRight dragon active raster grid: resize raster gridMouse wheel: rotate omega by 90°Shift + Mouse wheel: rotate omega by 10°Ctrl + Mouse wheel: change sample camera exposure by a large stepAlt + Mouse wheel: change sample camera exposure by a small stepShift + Mouse move: inspect/load raster image under cursor
Video Views
Ctrl + Mouse wheel: zoom in/outF: fit to viewR: reset zoom+or=: zoom in-: zoom out
Sample Queue
Delete: remove selected samplesSpace: run / pause queue automation
Workflow Panel
Delete: remove selected queue itemsSpace: pause / resume workflowCtrl + R: refresh workflow queueCtrl + Delete: clear non-running workflow queue items
Global Shortcuts
F1: open mouse / keyboard controls helpCtrl + Q: quit applicationCtrl + Shift + R: restore default view layoutCtrl + 1: switch to Sample camera tabCtrl + 2: switch to Gonio camera tabCtrl + 3: switch to Beamline view tabCtrl + 4: switch to Beamline combined view tabCtrl + L: raise Sample List panelCtrl + J: raise Automation list panelCtrl + M: go to Sample camera tabCtrl + W: toggle Workflow panelCtrl + Shift + T: toggle Target stability panelCtrl + Shift + P: toggle Prediction Metrics panelCtrl + Shift + S: toggle Smargon trace panel