diff --git a/pyproject.toml b/pyproject.toml index 2dffd57e7..37e4aa35b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dependencies = [ "ophyd == 1.9.0", "ophyd-async >= 0.3a5", "bluesky >= 1.13.0a4", - "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@3f59ce090dd5c5f94f761b4b80a61cbd34d90564", + "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@ff848a6984050b7c21cbf4b351cacb88a88cfbb1", ] diff --git a/src/mx_bluesky/hyperion/__main__.py b/src/mx_bluesky/hyperion/__main__.py index e55490d9a..f62078c31 100755 --- a/src/mx_bluesky/hyperion/__main__.py +++ b/src/mx_bluesky/hyperion/__main__.py @@ -286,7 +286,9 @@ def get(self, **kwargs): action = kwargs.get("action") status_and_message = StatusAndMessage(Status.FAILED, f"{action} not understood") if action == Actions.STATUS.value: - LOGGER.debug("Runner recieved status request") + LOGGER.debug( + f"Runner received status request - state of the runner object is: {self.runner.__dict__} - state of the RE is: {self.runner.RE.__dict__}" + ) status_and_message = self.runner.current_status return asdict(status_and_message) diff --git a/src/mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py b/src/mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py index b025c46e5..130a574d8 100755 --- a/src/mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py +++ b/src/mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py @@ -129,6 +129,7 @@ def flyscan_xray_centre( parameters.features.update_self_from_server() composite.eiger.set_detector_parameters(parameters.detector_params) composite.zocalo.zocalo_environment = parameters.zocalo_environment + composite.zocalo.use_cpu_and_gpu = parameters.use_cpu_and_gpu_zocalo feature_controlled = _get_feature_controlled(composite, parameters) @@ -202,14 +203,14 @@ def run_gridscan_and_move( ) else: xray_centre = initial_xyz - LOGGER.warning("No X-ray centre recieved") + LOGGER.warning("No X-ray centre received") if bbox_size is not None: with TRACER.start_span("change_aperture"): yield from set_aperture_for_bbox_size( fgs_composite.aperture_scatterguard, bbox_size ) else: - LOGGER.warning("No bounding box size recieved") + LOGGER.warning("No bounding box size received") # once we have the results, go to the appropriate position LOGGER.info("Moving to centre of mass.") diff --git a/src/mx_bluesky/hyperion/external_interaction/callbacks/__main__.py b/src/mx_bluesky/hyperion/external_interaction/callbacks/__main__.py index 4464fc54d..2007c6b85 100644 --- a/src/mx_bluesky/hyperion/external_interaction/callbacks/__main__.py +++ b/src/mx_bluesky/hyperion/external_interaction/callbacks/__main__.py @@ -108,7 +108,7 @@ def wait_for_threads_forever(threads: Sequence[Thread]): sleep(LIVENESS_POLL_SECONDS) alive = [t.is_alive() for t in threads] except KeyboardInterrupt: - log_info("Main thread recieved interrupt - exiting.") + log_info("Main thread received interrupt - exiting.") else: log_info("Proxy or dispatcher thread ended - exiting.") diff --git a/src/mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py b/src/mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py index 6eaa3712b..fcd4a822e 100644 --- a/src/mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py +++ b/src/mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py @@ -92,7 +92,7 @@ def activity_gated_event(self, doc: Event) -> Event: case _: return self._tag_doc(doc) self.ispyb_ids = self.ispyb.update_deposition(self.ispyb_ids, scan_data_infos) - ISPYB_LOGGER.info(f"Recieved ISPYB IDs: {self.ispyb_ids}") + ISPYB_LOGGER.info(f"Received ISPYB IDs: {self.ispyb_ids}") return self._tag_doc(doc) def _handle_ispyb_hardware_read(self, doc) -> Sequence[ScanDataInfo]: diff --git a/src/mx_bluesky/hyperion/parameters/constants.py b/src/mx_bluesky/hyperion/parameters/constants.py index d26d03c98..9eaedac75 100644 --- a/src/mx_bluesky/hyperion/parameters/constants.py +++ b/src/mx_bluesky/hyperion/parameters/constants.py @@ -114,6 +114,7 @@ class I03Constants: USE_PANDA_FOR_GRIDSCAN = False USE_GPU_FOR_GRIDSCAN_ANALYSIS = False THAWING_TIME = 20 + USE_CPU_AND_GPU_ZOCALO = False @dataclass(frozen=True) diff --git a/src/mx_bluesky/hyperion/parameters/gridscan.py b/src/mx_bluesky/hyperion/parameters/gridscan.py index 39b613889..4edc73548 100644 --- a/src/mx_bluesky/hyperion/parameters/gridscan.py +++ b/src/mx_bluesky/hyperion/parameters/gridscan.py @@ -37,6 +37,7 @@ class GridCommon( ) use_panda: bool = Field(default=CONST.I03.USE_PANDA_FOR_GRIDSCAN) use_gpu: bool = Field(default=CONST.I03.USE_GPU_FOR_GRIDSCAN_ANALYSIS) + use_cpu_and_gpu_zocalo: bool = Field(default=CONST.I03.USE_CPU_AND_GPU_ZOCALO) ispyb_experiment_type: IspybExperimentType = Field( default=IspybExperimentType.GRIDSCAN_3D ) diff --git a/tests/conftest.py b/tests/conftest.py index d477f08e3..3b23732a6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -843,7 +843,7 @@ def assert_doc( matches_fields: dict[str, Any] = {}, # noqa does_exist: bool = True, ): - """Assert that a matching doc has been recieved by the sim, + """Assert that a matching doc has been received by the sim, and returns the first match if it is meant to exist""" matches = DocumentCapturer.get_matches(docs, name, has_fields, matches_fields) if does_exist: