mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 63 Wiki Activity

feat: use beam centre model for diffractiongeometry

Browse Source
This commit is contained in:
perl_d
2026-08-24 11:17:59 +02:00
parent 93a5ddb34a
commit a10d0a9f95
5 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/beamline_dispatch/default/beamline_dispatch.py
+3 -2
View File
@@ -3,6 +3,7 @@ import os
from importlib.resources import files
from aarecommon.config.beamline import MXBeamline
from aarecommon.math.beam_center import BeamCenterFromDetectorStage
from aarecommon.models.beam_centre import BeamCentre
from aare.beamline_dispatch.protocols import AuthDispatch, BeamlineDispatch, Geometry
@@ -26,8 +27,8 @@ class DefaultGeometry(Geometry):
self._beamline = beamline
@property
def beam_centre_model(self) -> BeamCentre:
return self._model
def beam_centre_model(self) -> BeamCenterFromDetectorStage:
return self._model.model
class DefaultDispatch(BeamlineDispatch):
src/aare/beamline_dispatch/protocols.py
+2 -2
View File
@@ -1,7 +1,7 @@
from abc import ABC, abstractmethod
from typing import Any
from aarecommon.models.beam_centre import BeamCentre
from aarecommon.math.beam_center import BeamCenterFromDetectorStage
class AuthDispatch(ABC):
@@ -33,7 +33,7 @@ class BecMacros(ABC):
class Geometry(ABC):
@property
@abstractmethod
def beam_centre_model(self) -> BeamCentre: ...
def beam_centre_model(self) -> BeamCenterFromDetectorStage: ...
class BeamlineDispatch(ABC):
src/aare/daq/daq.py
+27 -41
View File
@@ -67,6 +67,7 @@ from aarecommon.models.rotation_scan import CompletedRotationScan, RotationScanR
from aarecommon.models.tell import TellPhaseEnum, TellStateModel
from aareDB import SampleEventType
from aare.beamline_dispatch.protocols import BeamlineDispatch
from aare.daq import workflows
from aare.daq.aaredb import AareWrapper
from aare.daq.config import ABR_POS_MOUNT, BeamlineConfig, BeamlineStateEnum
@@ -270,8 +271,9 @@ class AareDAQ:
AUTO_RASTER_MIN_CELL_SIZE_MM = 0.005
AUTO_RASTER_SKIP_IF_EXCEED_MAX_IMAGE_THRESHOLD = True
def __init__(self, cfg: BeamlineConfig, bl: MXBeamline):
def __init__(self, cfg: BeamlineConfig, bl: MXBeamline, dispatch: BeamlineDispatch):
self.last_time = 0.0
self._dispatch = dispatch
self._cfg = cfg
self._devs = BeamlineDevices(bl)
self._mlbox = MlBox(bl)
@@ -3151,46 +3153,30 @@ class AareDAQ:
@property
def diffraction_geometry(self) -> DiffractionGeometry:
try:
metadata = self._cached_detector_metadata()
width = int(metadata.get("detector_width", 1))
height = int(metadata.get("detector_height", 1))
pixel_size_mm = float(metadata.get("pixel_size_mm", 0.15))
detector_description = str(metadata.get("detector_description", "unavailable"))
detector_serial_number = str(metadata.get("detector_serial_number", "unavailable"))
energy = self._devs.energy_kev
dtz = self._devs.dtz
beam_center = self._cfg.beam_center
return DiffractionGeometry(
energy_keV=energy,
dtz_mm=dtz,
detector_size_pxl=(width, height),
pixel_size_mm=pixel_size_mm,
beam_center_pxl=beam_center,
detector_description=detector_description,
detector_serial_number=detector_serial_number,
poni_rot1_rad=-0.001396263,
poni_rot2_rad=-0.003839724,
)
except Exception as e:
logger.warning(
f"Falling back to default diffraction geometry because cached detector metadata is unavailable: {e}",
exc_info=True,
)
energy = self._devs.energy_kev
dtz = self._devs.dtz
beam_center = self._cfg.beam_center
return DiffractionGeometry(
energy_keV=energy,
dtz_mm=dtz,
detector_size_pxl=(1, 1),
pixel_size_mm=0.15,
beam_center_pxl=beam_center,
detector_description="unavailable",
detector_serial_number="unavailable",
poni_rot1_rad=-0.001396263,
poni_rot2_rad=-0.003839724,
)
metadata = self._cached_detector_metadata()
width = int(metadata.get("detector_width", 1))
height = int(metadata.get("detector_height", 1))
pixel_size_mm = float(metadata.get("pixel_size_mm", 0.15))
detector_description = str(metadata.get("detector_description", "unavailable"))
detector_serial_number = str(metadata.get("detector_serial_number", "unavailable"))
energy = self._devs.energy_kev
dtz = self._devs.dtz
beam_center_x, beam_center_y = self._dispatch.geo.beam_centre_model.predict(
dtz, self._devs.dty
)
beam_center_x, beam_center_y = float(beam_center_x[0]), float(beam_center_y[0])
return DiffractionGeometry(
energy_keV=energy,
dtz_mm=dtz,
detector_size_pxl=(width, height),
pixel_size_mm=pixel_size_mm,
beam_center_pxl=(beam_center_x, beam_center_y),
detector_description=detector_description,
detector_serial_number=detector_serial_number,
poni_rot1_rad=-0.001396263,
poni_rot2_rad=-0.003839724,
)
@property
def beamline_status(self) -> BeamlineStatus:
src/aare/daq/devices.py
+6 -1
View File
@@ -42,6 +42,7 @@ class BeamlineDevices:
# faster to define the dtz object here than in functions and then use
self._dtz = self.bec_worker.dev.det_z
self._dty = self.bec_worker.dev.det_y
self.dtz_mod = cfg_get("daq.detector_distance_limit_modifier", 1.0)
# TODO convert epics pvs to BEC
self._sample_cam = epicsAD(f"{BEAMLINE}-ES-MS:")
@@ -267,7 +268,11 @@ class BeamlineDevices:
# Detector Z
@property
def dtz(self) -> float:
return self._dtz.read()["det_z"]["value"]
return self._dtz.user_setpoint.get()
@property
def dty(self) -> float:
return self._dty.user_setpoint.get()
@dtz.setter
def dtz(self, value: float):
src/aare/daq/server.py
+1 -1
View File
@@ -108,7 +108,7 @@ async def lifespan(application: FastAPI):
# ── Core objects (Redis, EPICS PVs, BEC, TELL, JFJoch, etc.) ──
bl = mx_beamline()
cfg = BeamlineConfig(bl)
daq = AareDAQ(cfg, bl)
daq = AareDAQ(cfg, bl, bl_dispatch)
cfg.state = daq.read_current_state_from_bec()
try: