Read detector ID from device

pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.14.0",
     "bluesky >= 1.14.6",
-    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@62960e0e587bf86943ce1b581848fa131ef884d5",
+    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
 ]
 
 

src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -291,6 +291,7 @@ def construct_i04_specific_features(
         xrc_composite.eiger.bit_depth,
         xrc_composite.beamsize,
         xrc_composite.eiger.cam.roi_mode,
+        xrc_composite.eiger.ispyb_detector_id,
     ]
 
     tidy_plan = partial(

src/mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -76,6 +76,7 @@ def standard_read_hardware_during_collection(
         detector.bit_depth,
         beamsize,
         detector.cam.roi_mode,
+        detector.ispyb_detector_id,
     ]
     yield from read_hardware_plan(
         signals_to_read_during_collection, DocDescriptorNames.HARDWARE_READ_DURING

src/mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py

@@ -124,7 +124,6 @@ def _handle_ispyb_hardware_read(self, doc) -> Sequence[ScanDataInfo]:
         )
         synchrotron_mode = doc["data"]["synchrotron-synchrotron_mode"]
         assert isinstance(synchrotron_mode, SynchrotronMode)
-
         hwscan_data_collection_info = DataCollectionInfo(
             undulator_gap1=doc["data"]["undulator-current_gap"],
             synchrotron_mode=synchrotron_mode.value,
@@ -159,6 +158,7 @@ def _handle_ispyb_transmission_flux_read(
             beamsize_at_sampley=beamsize_y_mm,
             flux=doc["data"]["flux-flux_reading"],
             detector_mode="ROI" if doc["data"]["eiger_cam_roi_mode"] else "FULL",
+            ispyb_detector_id=doc["data"]["eiger-ispyb_detector_id"],
         )
         if transmission := doc["data"]["attenuator-actual_transmission"]:
             # Ispyb wants the transmission in a percentage, we use fractions

src/mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py

@@ -9,7 +9,6 @@
 )
 from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
 
-I03_EIGER_DETECTOR = 78
 EIGER_FILE_SUFFIX = "h5"
 
 
@@ -31,7 +30,6 @@ def populate_remaining_data_collection_info(
     data_collection_info.sample_id = params.sample_id
     data_collection_info.visit_string = params.visit
     data_collection_info.parent_id = data_collection_group_id
-    data_collection_info.detector_id = I03_EIGER_DETECTOR
     data_collection_info.comments = comment
     data_collection_info.detector_distance = params.detector_params.detector_distance
     data_collection_info.exp_time = params.detector_params.exposure_time_s

src/mx_bluesky/common/external_interaction/ispyb/data_model.py

@@ -40,7 +40,7 @@ class DataCollectionInfo:
     kappa_start: float | None = None
 
     visit_string: str | None = None
-    detector_id: int | None = None
+    ispyb_detector_id: int | None = None
     axis_start: float | None = None
     slitgap_vertical: float | None = None
     slitgap_horizontal: float | None = None

src/mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py

@@ -282,7 +282,7 @@ def _data_collection_info_to_json(data: DataCollectionInfo) -> dict:
             "axisEnd": data.axis_end,
             "chiStart": data.chi_start,
             "kappaStart": data.kappa_start,
-            "detectorId": data.detector_id,
+            "detectorId": data.ispyb_detector_id,
             "axisStart": data.axis_start,
             "slitGapVertical": data.slitgap_vertical,
             "slitGapHorizontal": data.slitgap_horizontal,

src/mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -62,6 +62,7 @@ def construct_hyperion_specific_features(
         xrc_composite.eiger.bit_depth,
         xrc_composite.beamsize,
         xrc_composite.eiger.cam.roi_mode,
+        xrc_composite.eiger.ispyb_detector_id,
     ]
 
     setup_trigger_plan: Callable[..., MsgGenerator]

tests/conftest.py

@@ -1421,6 +1421,7 @@ def test_rotation_event_document_during_data_collection(self) -> Event:
                 "beamsize-x_um": 50.0,
                 "beamsize-y_um": 20.0,
                 "eiger_cam_roi_mode": False,
+                "eiger-ispyb_detector_id": 78,
             },
             "timestamps": {"det1": 1666604299.8220396, "det2": 1666604299.8235943},
             "seq_num": 1,
@@ -1536,6 +1537,7 @@ def test_event_document_during_data_collection(self) -> Event:
                 "beamsize-x_um": 50.0,
                 "beamsize-y_um": 20.0,
                 "eiger_cam_roi_mode": True,
+                "eiger-ispyb_detector_id": 78,
             },
             "timestamps": {
                 "det1": 1666604299.8220396,

tests/unit_tests/common/external_interaction/callbacks/ispyb/test_gridscan_ispyb_store_3d.py

@@ -61,7 +61,7 @@ def dummy_collection_group_info():
     kappa_start=None,
     parent_id=None,
     visit_string="cm31105-4",
-    detector_id=78,
+    ispyb_detector_id=78,
     axis_start=0.0,
     slitgap_vertical=0.1,
     slitgap_horizontal=0.1,

tests/unit_tests/common/external_interaction/callbacks/ispyb/test_rotation_ispyb_store.py

@@ -85,7 +85,7 @@ def scan_data_info_for_begin():
             kappa_start=0.0,
             parent_id=None,
             visit_string="cm31105-4",
-            detector_id=78,
+            ispyb_detector_id=78,
             axis_start=0.0,
             beamsize_at_samplex=1.0,
             beamsize_at_sampley=1.0,
@@ -128,7 +128,7 @@ def scan_data_info_for_update(scan_data_info_for_begin):
             kappa_start=0.0,
             parent_id=None,
             visit_string="cm31105-4",
-            detector_id=78,
+            ispyb_detector_id=78,
             axis_start=0.0,
             slitgap_vertical=1.0,
             slitgap_horizontal=1.0,

tests/unit_tests/common/external_interaction/xray_centre/test_ispyb_callback.py

@@ -41,7 +41,6 @@
 
 EXPECTED_DATA_COLLECTION_3D_XY = {
     "comments": "MX-Bluesky: Xray centring 1 -",
-    "detectorId": 78,
     "detectorDistance": 100.0,
     "exposureTime": 0.1,
     "imageDirectory": "{tmp_data}/",
@@ -194,6 +193,7 @@ def test_flux_read_events_3d(self, mock_ispyb_conn, test_event_data):
             "beamSizeAtSampleX": 0.05,
             "beamSizeAtSampleY": 0.02,
             "detectorMode": "ROI",
+            "detectorId": 78,
         }
         assert update_dc_requests[0].dcid == TEST_DATA_COLLECTION_IDS[0]
         assert update_dc_requests[1].dcid == TEST_DATA_COLLECTION_IDS[1]

tests/unit_tests/conftest.py

@@ -159,6 +159,7 @@ async def fail_test_on_unclosed_tasks(request: FixtureRequest):
     "beamsize-x_um": 50.0,
     "beamsize-y_um": 20.0,
     "eiger_cam_roi_mode": True,
+    "eiger-ispyb_detector_id": 78,
 }
 
 

tests/unit_tests/hyperion/external_interaction/callbacks/rotation/test_ispyb_callback.py

@@ -28,7 +28,6 @@
 TEST_SAMPLE_ID = 123456
 
 EXPECTED_DATA_COLLECTION = {
-    "detectorId": 78,
     "axisStart": 0.0,
     "axisRange": 0.1,
     "axisEnd": -180,
@@ -165,6 +164,7 @@ def test_flux_read_events(
         "flux": 9.81,
         "resolution": 1.1830593331191241,
         "detectorMode": "FULL",
+        "detectorId": 78,
     }