Merge branch 'main' into updated-jungfrau-rotation-devices

Author: olliesilvester

src/dodal/beamlines/i02_1.py

@@ -50,6 +50,8 @@ def eiger(mock: bool = False) -> EigerDetector:
         wait=False,
         fake=mock,
         name="eiger",
+        beamline="i02-1",
+        ispyb_detector_id=101,
     )
 
 

src/dodal/beamlines/i03.py

@@ -159,6 +159,7 @@ def detector_motion() -> DetectorMotion:
 
 @devices.v1_init(EigerDetector, prefix="BL03I-EA-EIGER-01:", wait=False)
 def eiger(eiger: EigerDetector) -> EigerDetector:
+    eiger.detector_id = 78
     return eiger
 
 

src/dodal/beamlines/i04.py

@@ -213,10 +213,12 @@ def set_params(eiger: EigerDetector):
     return device_instantiation(
         device_factory=EigerDetector,
         name="eiger",
+        beamline="i04",
         prefix="-EA-EIGER-01:",
         wait=False,
         fake=mock,
         post_create=set_params,
+        ispyb_detector_id=72,
     )
 
 

src/dodal/devices/eiger.py

@@ -4,6 +4,7 @@
 from bluesky.protocols import Stageable
 from ophyd import Component, Device, EpicsSignalRO, Signal
 from ophyd.areadetector.cam import EigerDetectorCam
+from ophyd.signal import AttributeSignal
 from ophyd.status import AndStatus, Status, StatusBase, SubscriptionStatus
 
 from dodal.devices.detector import DetectorParams, TriggerMode
@@ -55,17 +56,31 @@ def set(self, value, *, timeout=None, settle_time=None, **kwargs):
 
     stale_params = Component(EpicsSignalRO, "CAM:StaleParameters_RBV")
     bit_depth = Component(EpicsSignalRO, "CAM:BitDepthImage_RBV")
-
     filewriters_finished: StatusBase
 
     detector_params: DetectorParams | None = None
 
     arming_status = Status()
     arming_status.set_finished()
 
-    def __init__(self, beamline: str = "i03", *args, **kwargs):
+    def __init__(
+        self,
+        beamline: str = "i03",
+        ispyb_detector_id: int | None = None,
+        *args,
+        **kwargs,
+    ):
         super().__init__(*args, **kwargs)
         self.beamline = beamline
+
+        self.detector_id = ispyb_detector_id
+        self.ispyb_detector_id = AttributeSignal(
+            attr="detector_id",
+            parent=self,
+            name="eiger-ispyb_detector_id",
+            write_access=False,
+        )
+
         # using i03 timeouts as default
         self.timeouts = AVAILABLE_TIMEOUTS.get(beamline, AVAILABLE_TIMEOUTS["i03"])
         self.disarming_status = None
@@ -74,10 +89,11 @@ def __init__(self, beamline: str = "i03", *args, **kwargs):
     def with_params(
         cls,
         params: DetectorParams,
-        name: str = "EigerDetector",
         beamline: str = "i03",
+        ispyb_detector_id: int | None = None,
+        name: str = "EigerDetector",
     ):
-        det = cls(name=name, beamline=beamline)
+        det = cls(name=name, beamline=beamline, ispyb_detector_id=ispyb_detector_id)
         det.set_detector_parameters(params)
         return det
 

tests/common/beamlines/test_beamline_utils.py

@@ -64,7 +64,14 @@ def test_instantiating_different_device_with_same_name():
 
 def test_instantiate_v1_function_fake_makes_fake():
     eiger: EigerDetector = beamline_utils.device_instantiation(
-        EigerDetector, "eiger", "", True, True, None
+        EigerDetector,
+        "eiger",
+        "",
+        True,
+        True,
+        None,
+        beamline="test",
+        ispyb_detector_id=0,
     )
     assert isinstance(eiger, Device)
     assert isinstance(eiger.stale_params, FakeEpicsSignal)
@@ -191,7 +198,14 @@ def _skip() -> bool:
 
 def test_clear_devices_destroys_ophyd_v1_devices():
     dev1 = beamline_utils.device_instantiation(
-        EigerDetector, "eiger", "", True, True, None
+        EigerDetector,
+        "eiger",
+        "",
+        True,
+        True,
+        None,
+        beamline="test",
+        ispyb_detector_id=0,
     )
     dev1.destroy = MagicMock()
 
@@ -202,7 +216,14 @@ def test_clear_devices_destroys_ophyd_v1_devices():
 
 def test_clear_device_destroys_ophyd_v1_device():
     dev1 = beamline_utils.device_instantiation(
-        EigerDetector, "eiger", "", True, True, None
+        EigerDetector,
+        "eiger",
+        "",
+        True,
+        True,
+        None,
+        beamline="test",
+        ispyb_detector_id=0,
     )
     dev1.destroy = MagicMock()
 

tests/devices/test_eiger.py

@@ -33,7 +33,10 @@ class StatusError(Exception):
 def fake_eiger(request, eiger_params: DetectorParams):
     fake_eiger_class = make_fake_device(EigerDetector)
     fake_eiger: EigerDetector = fake_eiger_class.with_params(
-        params=eiger_params, name=f"test fake Eiger: {request.node.name}"
+        params=eiger_params,
+        name=f"test fake Eiger: {request.node.name}",
+        beamline="i03",
+        ispyb_detector_id=78,
     )
     return fake_eiger