mx-bluesky 1.5.10__py3-none-any.whl → 1.5.11__py3-none-any.whl

mx_bluesky/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.10'
-__version_tuple__ = version_tuple = (1, 5, 10)
+__version__ = version = '1.5.11'
+__version_tuple__ = version_tuple = (1, 5, 11)
 
 __commit_id__ = commit_id = None

mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py

@@ -53,9 +53,9 @@ def go_to_furthest_maximum(
 ) -> MsgGenerator:
     """Rotate to positive or negative maximum, whichever is further away"""
 
-    LIMIT_OF_TRAVEL = 3600
+    limit_of_travel = 3600
     current_value: float = yield from bps.rd(goniometer.omega.user_readback)
 
     yield from bps.mv(
-        goniometer.omega, -LIMIT_OF_TRAVEL if current_value > 0 else LIMIT_OF_TRAVEL
+        goniometer.omega, -limit_of_travel if current_value > 0 else limit_of_travel
     )

mx_bluesky/beamlines/i02_1/parameters/gridscan.py

@@ -20,7 +20,7 @@ class SpecifiedTwoDGridScan(
         return self.grid_1_spec
 
     @property
-    def FGS_params(self) -> ZebraGridScanParamsTwoD:
+    def fast_gridscan_params(self) -> ZebraGridScanParamsTwoD:
         return ZebraGridScanParamsTwoD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,

mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -40,13 +40,13 @@ from mx_bluesky.common.device_setup_plans.setup_zebra_and_shutter import (
 )
 from mx_bluesky.common.experiment_plans.common_flyscan_xray_centre_plan import (
     BeamlineSpecificFGSFeatures,
-    construct_beamline_specific_FGS_features,
+    construct_beamline_specific_fast_gridscan_features,
 )
 from mx_bluesky.common.experiment_plans.common_grid_detect_then_xray_centre_plan import (
     grid_detect_then_xray_centre,
 )
 from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
-    setup_beamline_for_OAV,
+    setup_beamline_for_oav,
 )
 from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
     ZocaloCallback,
@@ -200,7 +200,7 @@ def get_ready_for_oav_and_close_shutter(
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
     group = "get_ready_for_oav_and_close_shutter"
     LOGGER.info("Non-udc tidy: Setting up beamline for OAV")
-    yield from setup_beamline_for_OAV(
+    yield from setup_beamline_for_oav(
         smargon, backlight, aperture_scatterguard, group=group
     )
     LOGGER.info("Non-udc tidy: Closing detector shutter")
@@ -243,14 +243,14 @@ def construct_i04_specific_features(
         xrc_composite.smargon.x,
         xrc_composite.smargon.y,
         xrc_composite.smargon.z,
-        xrc_composite.dcm.energy_in_kev,
+        xrc_composite.dcm.energy_in_keV,
     ]
 
     signals_to_read_during_collection = [
         xrc_composite.aperture_scatterguard,
         xrc_composite.attenuator.actual_transmission,
         xrc_composite.flux.flux_reading,
-        xrc_composite.dcm.energy_in_kev,
+        xrc_composite.dcm.energy_in_keV,
         xrc_composite.eiger.bit_depth,
     ]
 
@@ -264,10 +264,10 @@ def construct_i04_specific_features(
     set_flyscan_params_plan = partial(
         set_fast_grid_scan_params,
         xrc_composite.zebra_fast_grid_scan,
-        xrc_parameters.FGS_params,
+        xrc_parameters.fast_gridscan_params,
     )
     fgs_motors = xrc_composite.zebra_fast_grid_scan
-    return construct_beamline_specific_FGS_features(
+    return construct_beamline_specific_fast_gridscan_features(
         partial(
             setup_zebra_for_gridscan,
         ),

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -62,7 +62,7 @@ def thaw_and_stream_to_redis(
                      defaults are always correct
     """
 
-    def switch_forwarder_to_ROI() -> MsgGenerator:
+    def switch_forwarder_to_roi() -> MsgGenerator:
         yield from bps.complete(oav_to_redis_forwarder, wait=True)
         yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
@@ -75,7 +75,7 @@ def thaw_and_stream_to_redis(
         smargon,
         oav,
         oav_to_redis_forwarder,
-        switch_forwarder_to_ROI,
+        switch_forwarder_to_roi,
     )
 
 
@@ -110,14 +110,14 @@ def thaw_and_murko_centre(
                      defaults are always correct
     """
 
-    MURKO_RESULTS_GROUP = "get_results"
+    murko_results_group = "get_results"
 
-    def centre_then_switch_forwarder_to_ROI() -> MsgGenerator:
+    def centre_then_switch_forwarder_to_roi() -> MsgGenerator:
         yield from bps.complete(oav_to_redis_forwarder, wait=True)
 
         yield from bps.mv(oav_to_redis_forwarder.selected_source, Source.ROI.value)
 
-        yield from bps.wait(MURKO_RESULTS_GROUP)
+        yield from bps.wait(murko_results_group)
         x_predict = yield from bps.rd(murko_results.x_mm)
         y_predict = yield from bps.rd(murko_results.y_mm)
         z_predict = yield from bps.rd(murko_results.z_mm)
@@ -132,7 +132,7 @@ def thaw_and_murko_centre(
     yield from bps.mv(murko_results.sample_id, str(sample_id))
 
     yield from bps.stage(murko_results, wait=True)
-    yield from bps.trigger(murko_results, group=MURKO_RESULTS_GROUP)
+    yield from bps.trigger(murko_results, group=murko_results_group)
 
     yield from bpp.contingency_wrapper(
         _thaw_and_stream_to_redis(
@@ -143,7 +143,7 @@ def thaw_and_murko_centre(
             smargon,
             oav,
             oav_to_redis_forwarder,
-            centre_then_switch_forwarder_to_ROI,
+            centre_then_switch_forwarder_to_roi,
         ),
         final_plan=partial(bps.unstage, murko_results, wait=True),
     )
@@ -168,7 +168,7 @@ def _thaw(
         plan_between_rotations (MsgGenerator, optional): A plan to run between rotations
                                     of the smargon. Defaults to no plan.
     """
-    inital_velocity = yield from bps.rd(smargon.omega.velocity)
+    initial_velocity = yield from bps.rd(smargon.omega.velocity)
     new_velocity = abs(rotation / time_to_thaw) * 2.0
 
     def do_thaw():
@@ -180,7 +180,7 @@ def _thaw(
         yield from bps.rel_set(smargon.omega, -rotation, wait=True)
 
     def cleanup():
-        yield from bps.abs_set(smargon.omega.velocity, inital_velocity, wait=True)
+        yield from bps.abs_set(smargon.omega.velocity, initial_velocity, wait=True)
         yield from bps.abs_set(thawer.control, OnOff.OFF, wait=True)
 
     # Always cleanup even if there is a failure

mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py

@@ -3,10 +3,10 @@ from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
-from ophyd_async.core import WatchableAsyncStatus
 from ophyd_async.fastcs.jungfrau import (
     AcquisitionType,
     GainMode,
+    create_jungfrau_internal_triggering_info,
     create_jungfrau_pedestal_triggering_info,
 )
 from pydantic import PositiveInt
@@ -18,6 +18,7 @@ from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils impor
 from mx_bluesky.common.utils.log import LOGGER
 
 PEDESTAL_DARKS_RUN = "PEDESTAL DARKS RUN"
+STANDARD_DARKS_RUN = "STANDARD DARKS RUN"
 
 
 def do_pedestal_darks(
@@ -26,7 +27,7 @@ def do_pedestal_darks(
     pedestal_loops: PositiveInt = 200,
     jungfrau: CommissioningJungfrau = inject("jungfrau"),
     path_of_output_file: str | None = None,
-) -> MsgGenerator[WatchableAsyncStatus]:
+) -> MsgGenerator:
     """Acquire darks in pedestal mode, using dynamic gain mode. This calibrates the offsets
     for the jungfrau, and must be performed before acquiring real data in dynamic gain mode.
 
@@ -38,6 +39,9 @@ def do_pedestal_darks(
     4. Do the first three steps a second time, except use ForceSwitchG2 instead of ForceSwitchG1
     during step 2.
 
+    A pedestal scan should be acquired when detector configuration and environmental conditions change, but due to small
+    in instabilities in beamline conditions, it is recommended to run a pedestal scan on roughly an hourly basis.
+
     Args:
         exp_time_s: Length of detector exposure for each frame.
         pedestal_frames: Number of frames acquired per pedestal loop.
@@ -66,13 +70,54 @@ def do_pedestal_darks(
             jungfrau.drv.gain_mode,
             GainMode.DYNAMIC,
         )
-        return (
-            yield from fly_jungfrau(
-                jungfrau,
-                trigger_info,
-                wait=True,
-                log_on_percentage_prefix="Jungfrau pedestal dynamic gain mode darks triggers recieved",
-            )
+        yield from fly_jungfrau(
+            jungfrau,
+            trigger_info,
+            wait=True,
+            log_on_percentage_prefix="Jungfrau pedestal dynamic gain mode darks triggers received",
+        )
+
+    yield from _do_decorated_plan()
+
+
+def do_non_pedestal_darks(
+    gain_mode: GainMode,
+    exp_time_s: float = 0.001,
+    total_triggers: PositiveInt = 1000,
+    jungfrau: CommissioningJungfrau = inject("jungfrau"),
+    path_of_output_file: str | None = None,
+) -> MsgGenerator:
+    """Internally take a set of images at a given gain mode.
+
+    Non-pedestal darks are useful for detector panel cross-checks and for calculating masks.
+
+    Args:
+        gain_mode: Which gain mode to put the Jungfrau into before starting the acquisition.
+        exp_time_s: Length of detector exposure for each trigger.
+        total_triggers: Total triggers for the dark scan.
+        jungfrau: Jungfrau device
+        path_of_output_file: Absolute path of the detector file output, including file name. If None, then use the PathProvider
+            set during Jungfrau device instantiation
+    """
+
+    @bpp.set_run_key_decorator(STANDARD_DARKS_RUN)
+    @bpp.run_decorator(md={"subplan_name": STANDARD_DARKS_RUN})
+    @bpp.stage_decorator([jungfrau])
+    def _do_decorated_plan():
+        if path_of_output_file:
+            override_file_path(jungfrau, path_of_output_file)
+
+        trigger_info = create_jungfrau_internal_triggering_info(
+            total_triggers, exp_time_s
+        )
+
+        yield from bps.mv(jungfrau.drv.gain_mode, gain_mode)
+
+        yield from fly_jungfrau(
+            jungfrau,
+            trigger_info,
+            wait=True,
+            log_on_percentage_prefix=f"Jungfrau {gain_mode} gain mode darks triggers received",
         )
 
-    return (yield from _do_decorated_plan())
+    yield from _do_decorated_plan()

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py

@@ -30,7 +30,7 @@ def do_external_acquisition(
 
     Args:
         exp_time_s: Length of detector exposure for each frame.
-        total_triggers: Number of external triggers recieved before acquisition is marked as complete.
+        total_triggers: Number of external triggers received before acquisition is marked as complete.
         jungfrau: Jungfrau device
         output_file_name: Absolute path of the detector file output, including file name. If None, then use the PathProvider
             set during jungfrau device instantiation

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py

@@ -21,7 +21,7 @@ def fly_jungfrau(
     jungfrau: CommissioningJungfrau,
     trigger_info: TriggerInfo,
     wait: bool = False,
-    log_on_percentage_prefix="Jungfrau data collection triggers recieved",
+    log_on_percentage_prefix="Jungfrau data collection triggers received",
 ) -> MsgGenerator[WatchableAsyncStatus]:
     """Stage, prepare, and kickoff Jungfrau with a configured TriggerInfo. Optionally wait
     for completion.

mx_bluesky/beamlines/i24/serial/__init__.py

@@ -3,19 +3,20 @@ from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
     gui_move_backlight,
     gui_move_detector,
     gui_run_chip_collection,
+    gui_run_extruder_collection,
+    gui_set_fiducial_0,
     gui_set_zoom_level,
-    gui_sleep,
     gui_stage_move_on_click,
 )
 
-from .extruder.i24ssx_Extruder_Collect_py3v2 import (
+from .extruder.i24ssx_extruder_collect_py3v2 import (
     enter_hutch,
     initialise_extruder,
     laser_check,
     run_extruder_plan,
 )
-from .fixed_target.i24ssx_Chip_Collect_py3v1 import run_fixed_target_plan
-from .fixed_target.i24ssx_Chip_Manager_py3v1 import (
+from .fixed_target.i24ssx_chip_collect_py3v1 import run_fixed_target_plan
+from .fixed_target.i24ssx_chip_manager_py3v1 import (
     block_check,
     cs_maker,
     cs_reset,
@@ -56,9 +57,10 @@ __all__ = [
     # GUI plans
     "gui_stage_move_on_click",
     "gui_gonio_move_on_click",
-    "gui_sleep",
     "gui_move_detector",
     "gui_run_chip_collection",
     "gui_move_backlight",
     "gui_set_zoom_level",
+    "gui_set_fiducial_0",
+    "gui_run_extruder_collection",
 ]

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -95,7 +95,7 @@ class DCID:
 
     Attributes:
         error:
-            If an error has occured. This will be set, even if emit_errors = True
+            If an error has occurred. This will be set, even if emit_errors = True
     """
 
     def __init__(
@@ -157,7 +157,7 @@ class DCID:
             xbeam, ybeam = beam_settings.beam_center_in_mm
 
             if isinstance(self.detector, Eiger):
-                startImageNumber = 1
+                start_image_number = 1
             else:
                 raise ValueError("Unknown detector:", self.detector)
 
@@ -201,7 +201,7 @@ class DCID:
                 "imageDirectory": image_dir,
                 "numberOfImages": num_images,
                 "resolution": resolution,
-                "startImageNumber": startImageNumber,
+                "startImageNumber": start_image_number,
                 "startTime": start_time.isoformat(),
                 "transmission": transmission,
                 "visit": self.parameters.visit.name,

mx_bluesky/beamlines/i24/serial/extruder/{i24ssx_Extruder_Collect_py3v2.py → i24ssx_extruder_collect_py3v2.py}

@@ -46,7 +46,7 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline import (
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
-    UnknownDetectorType,
+    UnknownDetectorTypeError,
     get_detector_type,
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
@@ -113,17 +113,17 @@ def laser_check(
     """
     SSX_LOGGER.debug(f"Laser check: {mode}")
 
-    LASER_TTL = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
+    laser_ttl = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
 
     if mode == "laseron":
         yield from bps.abs_set(
-            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.SOFT_IN3
+            zebra.output.out_pvs[laser_ttl], zebra.mapping.sources.SOFT_IN3
         )
         yield from set_shutter_mode(zebra, "auto")
 
     if mode == "laseroff":
         yield from bps.abs_set(
-            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.DISCONNECT
+            zebra.output.out_pvs[laser_ttl], zebra.mapping.sources.DISCONNECT
         )
         yield from set_shutter_mode(zebra, "manual")
 
@@ -230,7 +230,7 @@ def main_extruder_plan(
 
         SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
 
-        caput(pv.eiger_seqID, int(caget(pv.eiger_seqID)) + 1)
+        caput(pv.eiger_seq_id, int(caget(pv.eiger_seq_id)) + 1)
         SSX_LOGGER.info(f"Eiger quickshot setup: filepath {filepath}")
         SSX_LOGGER.info(f"Eiger quickshot setup: filepath {parameters.filename}")
         SSX_LOGGER.info(
@@ -282,7 +282,7 @@ def main_extruder_plan(
     else:
         err = f"Unknown Detector Type, det_type = {parameters.detector_name}"
         SSX_LOGGER.error(err)
-        raise UnknownDetectorType(err)
+        raise UnknownDetectorTypeError(err)
 
     beam_settings = yield from read_beam_info_from_hardware(
         dcm, mirrors, beam_center_device, parameters.detector_name
@@ -291,7 +291,7 @@ def main_extruder_plan(
     # Do DCID creation BEFORE arming the detector
     filetemplate = f"{parameters.filename}.nxs"
     if parameters.detector_name == "eiger":
-        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        complete_filename = cagetstring(pv.eiger_od_filename_rbv)
         filetemplate = f"{complete_filename}.nxs"
     dcid.generate_dcid(
         beam_settings=beam_settings,
@@ -387,7 +387,7 @@ def tidy_up_at_collection_end_plan(
     # Clean Up
     if parameters.detector_name == "eiger":
         yield from sup.eiger("return-to-normal", None, dcm)
-        SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
+        SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seq_id)}")
     SSX_LOGGER.debug("End of Run")
     SSX_LOGGER.info("Close hutch shutter")
     yield from bps.abs_set(shutter, ShutterDemand.CLOSE, wait=True)
@@ -402,7 +402,7 @@ def collection_complete_plan(
     if detector_name == "eiger":
         SSX_LOGGER.info("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
-        caput(pv.eiger_ODcapture, "Done")
+        caput(pv.eiger_od_capture, "Done")
 
     yield from bps.sleep(0.5)
 
@@ -413,32 +413,20 @@ def collection_complete_plan(
     yield from bps.null()
 
 
-def run_extruder_plan(
-    zebra: Zebra = inject("zebra"),
-    aperture: Aperture = inject("aperture"),
-    backlight: DualBacklight = inject("backlight"),
-    beamstop: Beamstop = inject("beamstop"),
-    detector_stage: YZStage = inject("detector_motion"),
-    shutter: HutchShutter = inject("shutter"),
-    dcm: DCM = inject("dcm"),
-    mirrors: FocusMirrorsMode = inject("focus_mirrors"),
-    attenuator: ReadOnlyAttenuator = inject("attenuator"),
-    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+def run_plan_in_wrapper(
+    zebra: Zebra,
+    aperture: Aperture,
+    backlight: DualBacklight,
+    beamstop: Beamstop,
+    detector_stage: YZStage,
+    shutter: HutchShutter,
+    dcm: DCM,
+    mirrors: FocusMirrorsMode,
+    beam_center_eiger: DetectorBeamCenter,
+    parameters: ExtruderParameters,
+    dcid: DCID,
+    start_time: datetime,
 ) -> MsgGenerator:
-    start_time = datetime.now()
-    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
-
-    parameters: ExtruderParameters = yield from read_parameters(
-        detector_stage, attenuator
-    )
-    # Create collection directory
-    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
-
-    beam_center_device = beam_center_eiger
-
-    # DCID - not generated yet
-    dcid = DCID(emit_errors=False, expt_params=parameters)
-
     yield from bpp.contingency_wrapper(
         main_extruder_plan(
             zebra=zebra,
@@ -449,7 +437,7 @@ def run_extruder_plan(
             shutter=shutter,
             dcm=dcm,
             mirrors=mirrors,
-            beam_center_device=beam_center_device,
+            beam_center_device=beam_center_eiger,
             parameters=parameters,
             dcid=dcid,
             start_time=start_time,
@@ -469,3 +457,45 @@ def run_extruder_plan(
         ),
         auto_raise=False,
     )
+
+
+def run_extruder_plan(
+    zebra: Zebra = inject("zebra"),
+    aperture: Aperture = inject("aperture"),
+    backlight: DualBacklight = inject("backlight"),
+    beamstop: Beamstop = inject("beamstop"),
+    detector_stage: YZStage = inject("detector_motion"),
+    shutter: HutchShutter = inject("shutter"),
+    dcm: DCM = inject("dcm"),
+    mirrors: FocusMirrorsMode = inject("focus_mirrors"),
+    attenuator: ReadOnlyAttenuator = inject("attenuator"),
+    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+) -> MsgGenerator:
+    start_time = datetime.now()
+    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
+
+    parameters: ExtruderParameters = yield from read_parameters(
+        detector_stage, attenuator
+    )
+    # Create collection directory
+    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
+
+    beam_center_device = beam_center_eiger
+
+    # DCID - not generated yet
+    dcid = DCID(emit_errors=False, expt_params=parameters)
+
+    yield from run_plan_in_wrapper(
+        zebra,
+        aperture,
+        backlight,
+        beamstop,
+        detector_stage,
+        shutter,
+        dcm,
+        mirrors,
+        beam_center_device,
+        parameters,
+        dcid,
+        start_time,
+    )

mx_bluesky/beamlines/i24/serial/fixed_target/{i24ssx_Chip_Collect_py3v1.py → i24ssx_chip_collect_py3v1.py}

@@ -31,7 +31,7 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     MappingType,
     PumpProbeSetting,
 )
-from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_chip_manager_py3v1 import (
     read_parameters,
     upload_chip_map_to_geobrick,
 )
@@ -335,7 +335,7 @@ def start_i24(
 
         # DCID process depends on detector PVs being set up already
         SSX_LOGGER.debug("Start DCID process")
-        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        complete_filename = cagetstring(pv.eiger_od_filename_rbv)
         filetemplate = f"{complete_filename}.nxs"
         dcid.generate_dcid(
             beam_settings=beam_settings,
@@ -401,7 +401,7 @@ def finish_i24(
         SSX_LOGGER.debug("Finish I24 Eiger")
         yield from reset_zebra_when_collection_done_plan(zebra)
         yield from sup.eiger("return-to-normal", None, dcm)
-        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)  # type: ignore
+        complete_filename = cagetstring(pv.eiger_od_filename_rbv)  # type: ignore
     else:
         raise ValueError(f"{parameters.detector_name} unrecognised")
 
@@ -538,7 +538,7 @@ def collection_complete_plan(
     SSX_LOGGER.debug(f"Collection end time {end_time}")
     dcid.collection_complete(end_time, aborted=False)
 
-    # NOTE no files to copy anymore but shoud write userlog here
+    # NOTE no files to copy anymore but should write userlog here
     yield from bps.null()
 
 
@@ -562,7 +562,7 @@ def tidy_up_after_collection_plan(
     if parameters.detector_name == "eiger":
         SSX_LOGGER.debug("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
-        caput(pv.eiger_ODcapture, "Done")
+        caput(pv.eiger_od_capture, "Done")
         yield from bps.sleep(0.5)
 
     yield from finish_i24(zebra, pmac, shutter, dcm, parameters)