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

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -37,7 +37,7 @@ def call_nexgen(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     current_chip_map = None
@@ -55,7 +55,7 @@ def call_nexgen(
             total_numb_imgs = parameters.num_images
             pump_status = parameters.pump_status
 
-    filename_prefix = cagetstring(Eiger.pv.filenameRBV)
+    filename_prefix = cagetstring(Eiger.PV.filename_rbv)
     meta_h5 = parameters.visit / parameters.directory / f"{filename_prefix}_meta.h5"
     t0 = time.time()
     max_wait = 60  # seconds
@@ -71,7 +71,7 @@ def call_nexgen(
         SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
         return
 
-    bit_depth = int(caget(Eiger.pv.bit_depth))
+    bit_depth = int(caget(Eiger.PV.bit_depth))
     SSX_LOGGER.debug(
         f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}"
     )
@@ -109,7 +109,7 @@ def submit_to_server(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     access_token = pathlib.Path("/scratch/ssx_nexgen.key").read_text().strip()

mx_bluesky/common/device_setup_plans/robot_load_unload.py

@@ -7,7 +7,7 @@ from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureVal
 from dodal.devices.motors import XYZStage
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import CombinedMove, Smargon, StubPosition
-from dodal.plan_stubs.motor_utils import MoveTooLarge, home_and_reset_wrapper
+from dodal.plan_stubs.motor_utils import MoveTooLargeError, home_and_reset_wrapper
 
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
@@ -39,7 +39,7 @@ def wait_for_smargon_not_disabled(smargon: Smargon, timeout=60):
 
 def _raise_exception_if_moved_out_of_cryojet(exception):
     yield from bps.null()
-    if isinstance(exception, MoveTooLarge):
+    if isinstance(exception, MoveTooLargeError):
         raise Exception(
             f"Moving {exception.axis} back to {exception.position} after \
                         robot load would move it out of the cryojet. The max safe \

mx_bluesky/common/device_setup_plans/setup_oav.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 import bluesky.plan_stubs as bps
-from dodal.devices.areadetector.plugins.CAM import ColorMode
+from dodal.devices.areadetector.plugins.cam import ColorMode
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

mx_bluesky/common/device_setup_plans/xbpm_feedback.py

@@ -16,7 +16,7 @@ def unpause_xbpm_feedback_and_set_transmission_to_1(
                                       the beam in position
         attenuator (BinaryFilterAttenuator): The attenuator used to set transmission
     """
-    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.RUN, attenuator, 1.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.RUN, attenuator, 1.0)
 
 
 def check_and_pause_feedback(
@@ -35,11 +35,11 @@ def check_and_pause_feedback(
                                                turning XBPM feedback off.
 
     """
-    yield from bps.mv(attenuator, 1.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(attenuator, 1.0)
     LOGGER.info("Waiting for XBPM feedback to be stable")
     yield from bps.trigger(xbpm_feedback, wait=True)
     LOGGER.info(
         f"XPBM feedback in position, pausing and setting transmission to {desired_transmission_fraction}"
     )
-    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.PAUSE)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    yield from bps.mv(attenuator, desired_transmission_fraction)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(xbpm_feedback.pause_feedback, Pause.PAUSE)
+    yield from bps.mv(attenuator, desired_transmission_fraction)

mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -13,7 +13,7 @@ from dodal.common.beamlines.commissioning_mode import read_commissioning_mode
 from dodal.devices.fast_grid_scan import (
     FastGridScanCommon,
     FastGridScanThreeD,
-    GridScanInvalidException,
+    GridScanInvalidError,
 )
 from dodal.devices.zocalo import ZocaloResults
 from dodal.devices.zocalo.zocalo_results import (
@@ -37,8 +37,8 @@ from mx_bluesky.common.parameters.constants import (
 from mx_bluesky.common.parameters.device_composites import FlyScanEssentialDevices
 from mx_bluesky.common.parameters.gridscan import SpecifiedThreeDGridScan
 from mx_bluesky.common.utils.exceptions import (
-    CrystalNotFoundException,
-    SampleException,
+    CrystalNotFoundError,
+    SampleError,
 )
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.tracing import TRACER
@@ -77,7 +77,7 @@ def generic_tidy(xrc_composite: FlyScanEssentialDevices, wait=True) -> MsgGenera
     yield from bps.wait(group)
 
 
-def construct_beamline_specific_FGS_features(
+def construct_beamline_specific_fast_gridscan_features(
     setup_trigger_plan: Callable[..., MsgGenerator],
     tidy_plan: Callable[..., MsgGenerator],
     set_flyscan_params_plan: Callable[..., MsgGenerator],
@@ -235,7 +235,7 @@ def _fetch_xrc_results_from_zocalo(
             flyscan_results = [_generate_dummy_xrc_result(parameters)]
         else:
             LOGGER.warning("No X-ray centre received")
-            raise CrystalNotFoundException()
+            raise CrystalNotFoundError()
     yield from _fire_xray_centre_result_event(flyscan_results)
 
 
@@ -275,14 +275,14 @@ def run_gridscan(
     try:
         yield from beamline_specific.set_flyscan_params_plan()
     except FailedStatus as e:
-        if isinstance(e.__cause__, GridScanInvalidException):
-            raise SampleException(
+        if isinstance(e.__cause__, GridScanInvalidError):
+            raise SampleError(
                 "Scan invalid - gridscan not valid for detected pin position"
             ) from e
 
     LOGGER.info("Waiting for arming to finish")
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
-    yield from bps.stage(fgs_composite.eiger)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.stage(fgs_composite.eiger, wait=True)
 
     yield from kickoff_and_complete_gridscan(
         beamline_specific.fgs_motors,
@@ -301,7 +301,7 @@ def run_gridscan(
 def _xrc_result_in_boxes_to_result_in_mm(
     xrc_result: XrcResult, parameters: SpecifiedThreeDGridScan
 ) -> XRayCentreResult:
-    fgs_params = parameters.FGS_params
+    fgs_params = parameters.fast_gridscan_params
     xray_centre = fgs_params.grid_position_to_motor_position(
         np.array(xrc_result["centre_of_mass"])
     )

mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py

@@ -29,7 +29,7 @@ from mx_bluesky.common.experiment_plans.oav_grid_detection_plan import (
     grid_detection_plan,
 )
 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.grid_detection_callback import (
     GridDetectionCallback,
@@ -123,7 +123,7 @@ def detect_grid_and_do_gridscan(
 
     grid_params_callback = GridDetectionCallback()
 
-    yield from setup_beamline_for_OAV(
+    yield from setup_beamline_for_oav(
         composite.smargon,
         composite.backlight,
         composite.aperture_scatterguard,

mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py

@@ -46,7 +46,7 @@ def _wait_for_zocalo_to_stage_then_do_fgs(
     LOGGER.info("Waiting for Zocalo device queue to have been cleared...")
     yield from bps.wait(ZOCALO_STAGE_GROUP)
 
-    # Triggers Zocalo if RE is subscribed to ZocaloCallback
+    # Triggers Zocalo if run_engine is subscribed to ZocaloCallback
     yield from read_hardware_for_zocalo(detector)
     LOGGER.info("Wait for all moves with no assigned group")
     yield from bps.wait()
@@ -103,7 +103,7 @@ def kickoff_and_complete_gridscan(
     )
     @bpp.contingency_decorator(
         except_plan=lambda e: (yield from bps.stop(detector)),  # type: ignore # Fix types in ophyd-async (https://github.com/DiamondLightSource/mx-bluesky/issues/855)
-        else_plan=lambda: (yield from bps.unstage(detector)),
+        else_plan=lambda: (yield from bps.unstage(detector, wait=True)),
     )
     def _decorated_do_fgs():
         yield from _wait_for_zocalo_to_stage_then_do_fgs(

mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -4,7 +4,7 @@ import bluesky.plan_stubs as bps
 from bluesky.protocols import Readable
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
 from dodal.devices.s4_slit_gaps import S4SlitGaps
@@ -43,7 +43,7 @@ def standard_read_hardware_pre_collection(
     undulator: Undulator,
     synchrotron: Synchrotron,
     s4_slit_gaps: S4SlitGaps,
-    dcm: BaseDCM,
+    dcm: DoubleCrystalMonochromator,
     smargon: Smargon,
 ):
     LOGGER.info("Reading status of beamline for callbacks, pre collection.")
@@ -52,7 +52,7 @@ def standard_read_hardware_pre_collection(
         synchrotron.synchrotron_mode,
         s4_slit_gaps,
         smargon,
-        dcm.energy_in_kev,
+        dcm.energy_in_keV,
     ]
     yield from read_hardware_plan(
         signals_to_read_pre_flyscan, DocDescriptorNames.HARDWARE_READ_PRE
@@ -63,14 +63,14 @@ def standard_read_hardware_during_collection(
     aperture_scatterguard: ApertureScatterguard,
     attenuator: BinaryFilterAttenuator,
     flux: Flux,
-    dcm: BaseDCM,
+    dcm: DoubleCrystalMonochromator,
     detector: EigerDetector,
 ):
     signals_to_read_during_collection = [
         aperture_scatterguard,
         attenuator.actual_transmission,
         flux.flux_reading,
-        dcm.energy_in_kev,
+        dcm.energy_in_keV,
         detector.bit_depth,
     ]
     yield from read_hardware_plan(

mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py

@@ -1,13 +1,15 @@
 import bluesky.plan_stubs as bps
 import pydantic
+from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.collimation_table import CollimationTable
-from dodal.devices.cryostream import CryoStream
+from dodal.devices.cryostream import CryoStream, CryoStreamGantry, CryoStreamSelection
 from dodal.devices.cryostream import InOut as CryoInOut
 from dodal.devices.fluorescence_detector_motion import (
     FluorescenceDetector,
 )
 from dodal.devices.fluorescence_detector_motion import InOut as FlouInOut
+from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
 from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.scintillator import InOut as ScinInOut
 from dodal.devices.scintillator import Scintillator
@@ -16,15 +18,18 @@ from dodal.devices.scintillator import Scintillator
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class UDCDefaultDevices:
     cryostream: CryoStream
+    cryostream_gantry: CryoStreamGantry
     fluorescence_det_motion: FluorescenceDetector
     beamstop: Beamstop
     scintillator: Scintillator
     aperture_scatterguard: ApertureScatterguard
     collimation_table: CollimationTable
+    hutch_shutter: HutchShutter
 
 
 def move_to_udc_default_state(devices: UDCDefaultDevices):
     """Moves beamline to known positions prior to UDC start"""
+    yield from _verify_correct_cryostream_selected(devices.cryostream_gantry)
 
     cryostream_temp = yield from bps.rd(devices.cryostream.temperature_k)
     cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure_bar)
@@ -33,6 +38,10 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     if cryostream_pressure > devices.cryostream.MAX_PRESSURE_BAR:
         raise ValueError("Cryostream back pressure is too high, not starting UDC")
 
+    yield from bps.abs_set(
+        devices.hutch_shutter, ShutterDemand.OPEN, group="udc_default"
+    )
+
     yield from bps.abs_set(devices.scintillator.selected_pos, ScinInOut.OUT, wait=True)
 
     yield from bps.abs_set(
@@ -63,3 +72,15 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     yield from bps.abs_set(devices.cryostream.fine, CryoInOut.IN, group="udc_default")
 
     yield from bps.wait("udc_default")
+
+
+def _verify_correct_cryostream_selected(
+    cryostream_gantry: CryoStreamGantry,
+) -> MsgGenerator:
+    cryostream_selection = yield from bps.rd(cryostream_gantry.cryostream_selector)
+    cryostream_selected = yield from bps.rd(cryostream_gantry.cryostream_selected)
+    if cryostream_selection != CryoStreamSelection.CRYOJET or cryostream_selected != 1:
+        raise ValueError(
+            f"Cryostream is not selected for use, control PV selection = {cryostream_selection}, "
+            f"current status {cryostream_selected}"
+        )

mx_bluesky/common/experiment_plans/inner_plans/write_sample_status.py

@@ -6,7 +6,7 @@ import bluesky.preprocessors as bpp
 from mx_bluesky.common.external_interaction.callbacks.sample_handling.sample_handling_callback import (
     SampleHandlingCallback,
 )
-from mx_bluesky.common.utils.exceptions import SampleException
+from mx_bluesky.common.utils.exceptions import SampleError
 
 
 class SampleStatusExceptionType(StrEnum):
@@ -27,7 +27,7 @@ def deposit_sample_error(exception_type: SampleStatusExceptionType, sample_id: i
         if exception_type == SampleStatusExceptionType.BEAMLINE:
             raise AssertionError()
         elif exception_type == SampleStatusExceptionType.SAMPLE:
-            raise SampleException
+            raise SampleError
 
     yield from _inner()
 

mx_bluesky/common/experiment_plans/oav_grid_detection_plan.py

@@ -10,7 +10,7 @@ from bluesky.utils import MsgGenerator
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.oav.pin_image_recognition.utils import NONE_VALUE
-from dodal.devices.oav.utils import PinNotFoundException, wait_for_tip_to_be_found
+from dodal.devices.oav.utils import PinNotFoundError, wait_for_tip_to_be_found
 from dodal.devices.smargon import Smargon
 
 from mx_bluesky.common.device_setup_plans.setup_oav import (
@@ -108,7 +108,7 @@ def grid_detection_plan(
         yield from bps.sleep(HardwareConstants.OAV_REFRESH_DELAY)
 
         tip_x_px, tip_y_px = yield from catch_exception_and_warn(
-            PinNotFoundException, wait_for_tip_to_be_found, pin_tip_detection
+            PinNotFoundError, wait_for_tip_to_be_found, pin_tip_detection
         )
 
         LOGGER.info(f"Tip is at x,y: {tip_x_px},{tip_y_px}")

mx_bluesky/common/experiment_plans/oav_snapshot_plan.py

@@ -27,7 +27,7 @@ class OavSnapshotComposite(Protocol):
     backlight: Backlight
 
 
-def setup_beamline_for_OAV(
+def setup_beamline_for_oav(
     smargon: Smargon,
     backlight: Backlight,
     aperture_scatterguard: ApertureScatterguard,

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

@@ -29,7 +29,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import get_ispyb_c
 from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
 from mx_bluesky.common.parameters.constants import DocDescriptorNames
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
-from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
+from mx_bluesky.common.utils.utils import convert_ev_to_angstrom
 
 D = TypeVar("D")
 if TYPE_CHECKING:
@@ -43,9 +43,9 @@ def _update_based_on_energy(
 ):
     """If energy has been read as part of this reading then add it into the data
     collection info along with the other fields that depend on it."""
-    if energy_kev := doc["data"].get("dcm-energy_in_kev", None):
+    if energy_kev := doc["data"].get("dcm-energy_in_keV", None):
         energy_ev = energy_kev * 1000
-        wavelength_angstroms = convert_eV_to_angstrom(energy_ev)
+        wavelength_angstroms = convert_ev_to_angstrom(energy_ev)
         data_collection_info.wavelength = wavelength_angstroms
         data_collection_info.resolution = resolution(
             detector_params,

mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py

@@ -40,7 +40,7 @@ class PlanReactiveCallback(CallbackBase):
         self.log = log
 
     def _run_activity_gated(self, name: str, func, doc, override=False):
-        # Runs `func` if self.active is True or overide is true. Override can be used
+        # Runs `func` if self.active is True or override is true. Override can be used
         # to run the function even after setting self.active to False, i.e. in the last
         # handler of a run.
 

mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py

@@ -9,7 +9,7 @@ from dodal.devices.zocalo import ZocaloStartInfo, ZocaloTrigger
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
 )
-from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMade
+from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMadeError
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
 
 if TYPE_CHECKING:
@@ -89,7 +89,7 @@ class ZocaloCallback(CallbackBase):
                 f"Zocalo handler received stop document, for run {doc.get('run_start')}."
             )
             if not self._started_zocalo_collections:
-                raise ISPyBDepositionNotMade(
+                raise ISPyBDepositionNotMadeError(
                     f"No ISPyB IDs received by the end of {self.triggering_plan=}"
                 )
             for info in self._started_zocalo_collections:

mx_bluesky/common/external_interaction/callbacks/sample_handling/sample_handling_callback.py

@@ -12,7 +12,7 @@ from mx_bluesky.common.external_interaction.ispyb.exp_eye_store import (
     BLSampleStatus,
     ExpeyeInteraction,
 )
-from mx_bluesky.common.utils.exceptions import CrystalNotFoundException, SampleException
+from mx_bluesky.common.utils.exceptions import CrystalNotFoundError, SampleError
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
 
 
@@ -47,7 +47,7 @@ class SampleHandlingCallback(PlanReactiveCallback):
             expeye = ExpeyeInteraction()
             if doc["exit_status"] != "success":
                 reason = doc.get("reason", "")
-                exception_type, message = SampleException.type_and_message_from_reason(
+                exception_type, message = SampleError.type_and_message_from_reason(
                     reason
                 )
                 self.log.info(
@@ -83,7 +83,7 @@ class SampleHandlingCallback(PlanReactiveCallback):
 
     def _decode_sample_status(self, exception_type: str) -> BLSampleStatus:
         match exception_type:
-            case SampleException.__name__ | CrystalNotFoundException.__name__:
+            case SampleError.__name__ | CrystalNotFoundError.__name__:
                 return BLSampleStatus.ERROR_SAMPLE
         return BLSampleStatus.ERROR_BEAMLINE
 

mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py

@@ -40,8 +40,8 @@ from mx_bluesky.common.parameters.components import DiffractionExperimentWithSam
 from mx_bluesky.common.parameters.constants import DocDescriptorNames, PlanNameConstants
 from mx_bluesky.common.parameters.gridscan import GridCommon
 from mx_bluesky.common.utils.exceptions import (
-    ISPyBDepositionNotMade,
-    SampleException,
+    ISPyBDepositionNotMadeError,
+    SampleError,
 )
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
 from mx_bluesky.common.utils.utils import number_of_frames_from_scan_spec
@@ -87,7 +87,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
     To use, subscribe the Bluesky RunEngine to an instance of this class.
     E.g.:
         ispyb_handler_callback = FGSISPyBCallback(parameters)
-        RE.subscribe(ispyb_handler_callback)
+        run_engine.subscribe(ispyb_handler_callback)
     Or decorate a plan using bluesky.preprocessors.subs_decorator.
 
     See: https://blueskyproject.io/bluesky/callbacks.html#ways-to-invoke-callbacks
@@ -303,8 +303,10 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                 f"with uid: {self.uid_to_finalize_on}."
             )
             if self.ispyb_ids == IspybIds():
-                raise ISPyBDepositionNotMade("ispyb was not initialised at run start")
-            exception_type, message = SampleException.type_and_message_from_reason(
+                raise ISPyBDepositionNotMadeError(
+                    "ispyb was not initialised at run start"
+                )
+            exception_type, message = SampleError.type_and_message_from_reason(
                 doc.get("reason", "")
             )
             if exception_type:

mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py

@@ -33,7 +33,7 @@ class GridscanNexusFileCallback(PlanReactiveCallback):
     To use, subscribe the Bluesky RunEngine to an instance of this class.
     E.g.:
         nexus_file_handler_callback = NexusFileCallback(parameters)
-        RE.subscribe(nexus_file_handler_callback)
+        run_engine.subscribe(nexus_file_handler_callback)
     Or decorate a plan using bluesky.preprocessors.subs_decorator.
 
     See: https://blueskyproject.io/bluesky/callbacks.html#ways-to-invoke-callbacks
@@ -89,7 +89,7 @@ class GridscanNexusFileCallback(PlanReactiveCallback):
                     nexus_writer.beam,
                     nexus_writer.attenuator,
                 ) = create_beam_and_attenuator_parameters(
-                    data["dcm-energy_in_kev"],
+                    data["dcm-energy_in_keV"],
                     data["flux-flux_reading"],
                     data["attenuator-actual_transmission"],
                 )

mx_bluesky/common/external_interaction/config_server.py

@@ -10,7 +10,7 @@ from pydantic import TypeAdapter
 from mx_bluesky.common.parameters.constants import (
     GDA_DOMAIN_PROPERTIES_PATH,
     FeatureSetting,
-    FeatureSettingources,
+    FeatureSettingSources,
     OavConstants,
 )
 from mx_bluesky.common.utils.log import LOGGER
@@ -25,7 +25,7 @@ T = TypeVar("T", bound=FeatureSetting)
 class MXConfigClient(ConfigServer, Generic[T]):
     def __init__(
         self,
-        feature_sources: type[FeatureSettingources],
+        feature_sources: type[FeatureSettingSources],
         feature_dc: type[T],
         url: str = "https://daq-config.diamond.ac.uk",
     ):

mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py

@@ -11,7 +11,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import (
     get_current_time_string,
     get_ispyb_config,
 )
-from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMade
+from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMadeError
 
 RobotActionID = int
 
@@ -40,7 +40,9 @@ def _send_and_get_response(auth, url, data, send_func) -> dict:
             resp_txt = str(response.json())
         except JSONDecodeError:
             resp_txt = str(response)
-        raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {resp_txt}")
+        raise ISPyBDepositionNotMadeError(
+            f"Could not write {data} to {url}: {resp_txt}"
+        )
     return response.json()
 
 

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -5,7 +5,6 @@ from dataclasses import asdict
 from typing import TYPE_CHECKING
 
 import ispyb
-import ispyb.sqlalchemy
 import numpy as np
 from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
 from ispyb.sp.mxacquisition import MXAcquisition

mx_bluesky/common/external_interaction/nexus/nexus_utils.py

@@ -11,7 +11,7 @@ from nexgen.nxs_utils.axes import TransformationType
 from numpy.typing import DTypeLike
 
 from mx_bluesky.common.utils.log import NEXUS_LOGGER
-from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
+from mx_bluesky.common.utils.utils import convert_ev_to_angstrom
 
 
 class AxisDirection(Enum):
@@ -158,6 +158,6 @@ def create_beam_and_attenuator_parameters(
         tuple[Beam, Attenuator]: Descriptions of the beam and attenuator for nexgen.
     """
     return (
-        Beam(wavelength=convert_eV_to_angstrom(energy_kev * 1000), flux=flux),
+        Beam(wavelength=convert_ev_to_angstrom(energy_kev * 1000), flux=flux),
         Attenuator(transmission=transmission_fraction),
     )

mx_bluesky/common/external_interaction/nexus/write_nexus.py

@@ -87,7 +87,7 @@ class NexusWriter:
         vds_shape = self.data_shape
 
         for filename in [self.nexus_file, self.master_file]:
-            NXmx_Writer = NXmxFileWriter(
+            nxmx_writer = NXmxFileWriter(
                 filename,
                 self.goniometer,
                 self.detector,
@@ -96,12 +96,12 @@ class NexusWriter:
                 self.attenuator,
                 self.full_num_of_images,
             )
-            NXmx_Writer.write(
+            nxmx_writer.write(
                 image_filename=f"{self.data_filename}",
                 start_time=start_time,
                 est_end_time=est_end_time,
             )
-            NXmx_Writer.write_vds(
+            nxmx_writer.write_vds(
                 vds_offset=self.start_index, vds_shape=vds_shape, vds_dtype=bit_depth
             )
 

mx_bluesky/common/parameters/constants.py

@@ -166,6 +166,6 @@ class Status(Enum):
 class FeatureSetting: ...  # List of features and their default values. Subclasses must also be a pydantic dataclass
 
 
-class FeatureSettingources(
+class FeatureSettingSources(
     StrEnum
 ): ...  # List of features and the name of that property in domain.properties

mx_bluesky/common/parameters/device_composites.py

@@ -4,7 +4,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.common_dcm import BaseDCM
+from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
@@ -51,7 +51,7 @@ class GridDetectThenXRayCentreComposite(FlyScanEssentialDevices):
     attenuator: BinaryFilterAttenuator
     backlight: Backlight
     beamstop: Beamstop
-    dcm: BaseDCM
+    dcm: DoubleCrystalMonochromator
     detector_motion: DetectorMotion
     zebra_fast_grid_scan: ZebraFastGridScanThreeD
     flux: Flux

mx_bluesky/common/parameters/gridscan.py

@@ -109,7 +109,7 @@ class SpecifiedGrid(GridCommon, XyzStarts, WithScan, Generic[GridScanParamType])
 
     @property
     @abstractmethod
-    def FGS_params(self) -> GridScanParamType: ...
+    def fast_gridscan_params(self) -> GridScanParamType: ...
 
     def do_set_stub_offsets(self, value: bool):
         self._set_stub_offsets = value
@@ -167,7 +167,7 @@ class SpecifiedThreeDGridScan(
     grid2_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_2)
 
     @property
-    def FGS_params(self) -> ZebraGridScanParamsThreeD:
+    def fast_gridscan_params(self) -> ZebraGridScanParamsThreeD:
         return ZebraGridScanParamsThreeD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,