chore: update jfjoch client dependency

This commit is contained in:
2026-09-01 14:27:58 +02:00
parent 8cb6ff1828
commit 08866f8cc5
4 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies = [
"aarecommon>=0.5.1",
"pydantic>=2.11",
"numpy",
"jfjoch_client==1.0.0rc146",
"jfjoch_client>=1.0.0rc146",
"pyJWT",
"pyzmq",
"opencv-python-headless",
@@ -51,6 +51,9 @@ class X06daBecMacros(BecMacros):
@staticmethod
def auto_exposure(): ...
# Add to Geo
# poni_rot1_rad=-0.001396263,
# poni_rot2_rad=-0.003839724,
class X06daDispatch(DefaultDispatch):
def __init__(self, beamline: MXBeamline) -> None:
@@ -96,6 +96,9 @@ class X10saGeometry(DefaultGeometry):
@property
def beam_centre_model(self) -> BeamCenterModel:
return self._model
@property
def deetector_tils(self) -> tuple[float, float]:
return 0,0
class X10saDispatch(DefaultDispatch):
+3 -2
View File
@@ -3154,6 +3154,7 @@ class AareDAQ:
detector_serial_number = str(metadata.get("detector_serial_number", "unavailable"))
energy = self._devs.energy_kev
dtz = self._devs.dtz
poni_rot1_rad, poni_rot2_rad = self._dispatch.geo.detector_tilt
return DiffractionGeometry(
energy_keV=energy,
dtz_mm=dtz,
@@ -3162,8 +3163,8 @@ class AareDAQ:
beam_center_pxl=self._devs.detector_beam_centre_px,
detector_description=detector_description,
detector_serial_number=detector_serial_number,
poni_rot1_rad=-0.001396263,
poni_rot2_rad=-0.003839724,
poni_rot1_rad=poni_rot1_rad,
poni_rot2_rad=poni_rot2_rad,
)
@property