mx-bluesky 1.4.4__py3-none-any.whl → 1.4.5__py3-none-any.whl

mx_bluesky/hyperion/experiment_plans/set_energy_plan.py

@@ -54,7 +54,9 @@ def set_energy_plan(
     if energy_ev:
         yield from transmission_and_xbpm_feedback_for_collection_wrapper(
             _set_energy_plan(energy_ev / 1000, composite),
+            composite.undulator_dcm.undulator_ref(),
             composite.xbpm_feedback,
             composite.attenuator,
+            composite.dcm,
             DESIRED_TRANSMISSION_FRACTION,
         )

mx_bluesky/hyperion/external_interaction/callbacks/__main__.py

@@ -3,6 +3,7 @@ from collections.abc import Callable, Sequence
 from threading import Thread
 from time import sleep
 
+from bluesky.callbacks import CallbackBase
 from bluesky.callbacks.zmq import Proxy, RemoteDispatcher
 from dodal.log import LOGGER as dodal_logger
 from dodal.log import set_up_all_logging_handlers
@@ -48,17 +49,33 @@ LIVENESS_POLL_SECONDS = 1
 ERROR_LOG_BUFFER_LINES = 5000
 
 
-def setup_callbacks():
-    return [
+def create_gridscan_callbacks() -> tuple[
+    GridscanNexusFileCallback, GridscanISPyBCallback
+]:
+    return (
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
             param_type=GridCommonWithHyperionDetectorParams,
             emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
         ),
+    )
+
+
+def create_rotation_callbacks() -> tuple[
+    RotationNexusFileCallback, RotationISPyBCallback
+]:
+    return (
         RotationNexusFileCallback(),
         RotationISPyBCallback(
             emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
         ),
+    )
+
+
+def setup_callbacks() -> list[CallbackBase]:
+    return [
+        *create_gridscan_callbacks(),
+        *create_rotation_callbacks(),
         LogUidTaggingCallback(),
         RobotLoadISPyBCallback(),
         SampleHandlingCallback(),

mx_bluesky/hyperion/external_interaction/config_server.py

@@ -1,6 +1,7 @@
 from functools import cache
 
 from daq_config_server.client import ConfigServer
+from pydantic import model_validator
 
 from mx_bluesky.common.external_interaction.config_server import FeatureFlags
 from mx_bluesky.common.utils.log import LOGGER
@@ -13,8 +14,10 @@ class HyperionFeatureFlags(FeatureFlags):
 
     Attributes:
         use_panda_for_gridscan:         If True then the PandA is used for gridscans, otherwise the zebra is used
-        compare_cpu_and_gpu_zocalo:     If True then GPU result processing is enabled alongside CPU, if False then
-            CPU only is used.
+        compare_cpu_and_gpu_zocalo:     If True then GPU result processing is enabled
+            alongside CPU and the results are compared. The CPU result is still take.n
+        use_gpu_results:                If True then GPU result processing is enabled
+            and the GPU result is taken.
         set_stub_offsets:               If True then set the stub offsets after moving to the crystal (ignored for
             multi-centre)
         omega_flip:                     If True then invert the smargon omega motor rotation commands with respect to
@@ -28,5 +31,13 @@ class HyperionFeatureFlags(FeatureFlags):
 
     use_panda_for_gridscan: bool = CONST.I03.USE_PANDA_FOR_GRIDSCAN
     compare_cpu_and_gpu_zocalo: bool = CONST.I03.COMPARE_CPU_AND_GPU_ZOCALO
+    use_gpu_results: bool = CONST.I03.USE_GPU_RESULTS
     set_stub_offsets: bool = CONST.I03.SET_STUB_OFFSETS
     omega_flip: bool = CONST.I03.OMEGA_FLIP
+
+    @model_validator(mode="after")
+    def use_gpu_and_compare_cannot_both_be_true(self):
+        assert not (self.use_gpu_results and self.compare_cpu_and_gpu_zocalo), (
+            "Cannot both use GPU results and compare them to CPU"
+        )
+        return self

mx_bluesky/hyperion/parameters/cli.py

@@ -8,7 +8,6 @@ from mx_bluesky._version import version
 @dataclass
 class HyperionArgs:
     dev_mode: bool = False
-    use_external_callbacks: bool = False
     verbose_event_logging: bool = False
     skip_startup_connection: bool = False
 
@@ -34,8 +33,7 @@ def parse_cli_args() -> HyperionArgs:
     """Parses all arguments relevant to hyperion. Returns an HyperionArgs dataclass with
     the fields: (verbose_event_logging: bool,
                  dev_mode: bool,
-                 skip_startup_connection: bool,
-                 external_callbacks: bool)"""
+                 skip_startup_connection: bool)"""
     parser = argparse.ArgumentParser()
     _add_callback_relevant_args(parser)
     parser.add_argument(
@@ -48,11 +46,6 @@ def parse_cli_args() -> HyperionArgs:
         action="store_true",
         help="Skip connecting to EPICS PVs on startup",
     )
-    parser.add_argument(
-        "--external-callbacks",
-        action="store_true",
-        help="Run the external hyperion-callbacks service and publish events over ZMQ",
-    )
     parser.add_argument(
         "--version",
         help="Print hyperion version string",
@@ -64,5 +57,4 @@ def parse_cli_args() -> HyperionArgs:
         verbose_event_logging=args.verbose_event_logging or False,
         dev_mode=args.dev or False,
         skip_startup_connection=args.skip_startup_connection or False,
-        use_external_callbacks=args.external_callbacks or False,
     )

mx_bluesky/hyperion/parameters/constants.py

@@ -4,6 +4,7 @@ from dodal.devices.detector import EIGER2_X_16M_SIZE
 from pydantic.dataclasses import dataclass
 
 from mx_bluesky.common.parameters.constants import (
+    DeviceSettingsConstants,
     DocDescriptorNames,
     EnvironmentConstants,
     ExperimentParamConstants,
@@ -31,9 +32,12 @@ class I03Constants:
     OMEGA_FLIP = True
 
     # Turns on GPU processing for zocalo and logs a comparison between GPU and CPU-
-    # processed results. GPU results never used in analysis for now
+    # processed results.
     COMPARE_CPU_AND_GPU_ZOCALO = False
 
+    # Turns on GPU processing for zocalo and uses the results that come back
+    USE_GPU_RESULTS = False
+
 
 @dataclass(frozen=True)
 class HyperionConstants:
@@ -57,6 +61,7 @@ class HyperionConstants:
     GRAYLOG_PORT = 12232
     PARAMETER_SCHEMA_DIRECTORY = "src/hyperion/parameters/schemas/"
     LOG_FILE_NAME = "hyperion.log"
+    DEVICE_SETTINGS_CONSTANTS = DeviceSettingsConstants()
 
 
 CONST = HyperionConstants()

mx_bluesky/hyperion/parameters/gridscan.py

@@ -47,7 +47,8 @@ class GridCommonWithHyperionDetectorParams(GridCommon, WithHyperionUDCFeatures):
             use_roi_mode=self.use_roi_mode,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             trigger_mode=self.trigger_mode,
-            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo,
+            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo
+            or self.features.use_gpu_results,
             **optional_args,
         )
 
@@ -83,7 +84,8 @@ class HyperionSpecifiedThreeDGridScan(SpecifiedThreeDGridScan, WithHyperionUDCFe
             use_roi_mode=self.use_roi_mode,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             trigger_mode=self.trigger_mode,
-            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo,
+            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo
+            or self.features.use_gpu_results,
             **optional_args,
         )