mx-bluesky 0.3.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

mx_bluesky/hyperion/tracing.py

@@ -0,0 +1,28 @@
+from opentelemetry import metrics, trace
+from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+
+def setup_tracing():
+    resource = Resource(attributes={SERVICE_NAME: "Hyperion"})
+
+    traceProvider = TracerProvider(resource=resource)
+    processor = BatchSpanProcessor(
+        OTLPSpanExporter(endpoint="http://0.0.0.0:4318/v1/traces")
+    )
+    traceProvider.add_span_processor(processor)
+    trace.set_tracer_provider(traceProvider)
+
+    reader = PeriodicExportingMetricReader(
+        OTLPMetricExporter(endpoint="http://0.0.0.0:4318/v1/metrics")
+    )
+    meterProvider = MeterProvider(resource=resource, metric_readers=[reader])
+    metrics.set_meter_provider(meterProvider)
+
+
+TRACER = trace.get_tracer(__name__)

mx_bluesky/hyperion/utils/context.py

@@ -0,0 +1,84 @@
+import dataclasses
+from typing import Any, ClassVar, Protocol, TypeVar, get_type_hints
+
+from blueapi.core import BlueskyContext
+from blueapi.core.bluesky_types import Device
+from dodal.utils import get_beamline_based_on_environment_variable
+
+import mx_bluesky.hyperion.experiment_plans as hyperion_plans
+from mx_bluesky.hyperion.log import LOGGER
+
+T = TypeVar("T", bound=Device)
+
+
+class _IsDataclass(Protocol):
+    """Protocol followed by any dataclass"""
+
+    __dataclass_fields__: ClassVar[dict]
+
+
+DT = TypeVar("DT", bound=_IsDataclass)
+
+
+def find_device_in_context(
+    context: BlueskyContext,
+    name: str,
+    # Typing in here is wrong (see https://github.com/microsoft/pyright/issues/7228#issuecomment-1934500232)
+    # but this whole thing will go away when we do https://github.com/DiamondLightSource/hyperion/issues/868
+    expected_type: type[T] = Device,  # type: ignore
+) -> T:
+    LOGGER.debug(f"Looking for device {name} of type {expected_type} in context")
+
+    device = context.find_device(name)
+    if device is None:
+        raise ValueError(
+            f"Cannot find device named '{name}' in bluesky context {context.devices}."
+        )
+
+    if not isinstance(device, expected_type):
+        raise ValueError(
+            f"Found device named '{name}' and expected it to be a '{expected_type}' but it was a '{device.__class__.__name__}'"
+        )
+
+    LOGGER.debug(f"Found matching device {device}")
+    return device
+
+
+def device_composite_from_context(context: BlueskyContext, dc: type[DT]) -> DT:
+    """
+    Initializes all of the devices referenced in a given dataclass from a provided
+    context, checking that the types of devices returned by the context are compatible
+    with the type annotations of the dataclass.
+
+    Note that if the context was not created with `wait_for_connection=True` devices may
+    still be unconnected.
+    """
+    LOGGER.debug(
+        f"Attempting to initialize devices referenced in dataclass {dc} from blueapi context"
+    )
+
+    devices: dict[str, Any] = {}
+    dc_type_hints: dict[str, Any] = get_type_hints(dc)
+
+    for field in dataclasses.fields(dc):
+        device = find_device_in_context(
+            context, field.name, expected_type=dc_type_hints.get(field.name, Device)
+        )
+
+        devices[field.name] = device
+
+    return dc(**devices)
+
+
+def setup_context(wait_for_connection: bool = True) -> BlueskyContext:
+    context = BlueskyContext()
+    context.with_plan_module(hyperion_plans)
+
+    context.with_dodal_module(
+        get_beamline_based_on_environment_variable(),
+        wait_for_connection=wait_for_connection,
+    )
+
+    LOGGER.info(f"Plans found in context: {context.plan_functions.keys()}")
+
+    return context

mx_bluesky/hyperion/utils/utils.py

@@ -0,0 +1,25 @@
+from scanspec.core import AxesPoints, Axis
+from scipy.constants import physical_constants
+
+hc_in_eV_and_Angstrom: float = (
+    physical_constants["speed of light in vacuum"][0]
+    * physical_constants["Planck constant in eV/Hz"][0]
+    * 1e10  # Angstroms per metre
+)
+
+
+def interconvert_eV_Angstrom(wavelength_or_energy: float) -> float:
+    return hc_in_eV_and_Angstrom / wavelength_or_energy
+
+
+def convert_eV_to_angstrom(hv: float) -> float:
+    return interconvert_eV_Angstrom(hv)
+
+
+def convert_angstrom_to_eV(wavelength: float) -> float:
+    return interconvert_eV_Angstrom(wavelength)
+
+
+def number_of_frames_from_scan_spec(scan_points: AxesPoints[Axis]):
+    ax = list(scan_points.keys())[0]
+    return len(scan_points[ax])

mx_bluesky/hyperion/utils/validation.py

@@ -0,0 +1,196 @@
+import gzip
+import json
+import os
+import shutil
+from pathlib import Path
+from unittest.mock import patch
+
+import bluesky.preprocessors as bpp
+from bluesky.run_engine import RunEngine
+from dodal.beamlines import i03
+from dodal.devices.oav.oav_parameters import OAVConfigParams
+from ophyd_async.core import set_mock_value
+
+from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
+    read_hardware_during_collection,
+)
+from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
+    RotationScanComposite,
+)
+from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
+    RotationNexusFileCallback,
+)
+from mx_bluesky.hyperion.parameters.constants import CONST
+from mx_bluesky.hyperion.parameters.rotation import RotationScan
+
+DISPLAY_CONFIGURATION = "tests/devices/unit_tests/test_display.configuration"
+ZOOM_LEVELS_XML = "tests/devices/unit_tests/test_jCameraManZoomLevels.xml"
+TEST_DATA_DIRECTORY = Path("tests/test_data/nexus_files/rotation")
+TEST_METAFILE = "ins_8_5_meta.h5.gz"
+FAKE_DATAFILE = "../fake_data.h5"
+FILENAME_STUB = "test_rotation_nexus"
+
+
+def test_params(filename_stub, dir):
+    def get_params(filename):
+        with open(filename) as f:
+            return json.loads(f.read())
+
+    params = RotationScan(
+        **get_params(
+            "tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json"
+        )
+    )
+    params.file_name = filename_stub
+    params.scan_width_deg = 360
+    params.demand_energy_ev = 12700
+    params.storage_directory = str(dir)
+    params.x_start_um = 0
+    params.y_start_um = 0
+    params.z_start_um = 0
+    params.exposure_time_s = 0.004
+    return params
+
+
+def fake_rotation_scan(
+    parameters: RotationScan,
+    subscription: RotationNexusFileCallback,
+    rotation_devices: RotationScanComposite,
+):
+    @bpp.subs_decorator(subscription)
+    @bpp.set_run_key_decorator("rotation_scan_with_cleanup_and_subs")
+    @bpp.run_decorator(  # attach experiment metadata to the start document
+        md={
+            "subplan_name": CONST.PLAN.ROTATION_OUTER,
+            "hyperion_parameters": parameters.model_dump_json(),
+            "activate_callbacks": "RotationNexusFileCallback",
+        }
+    )
+    def plan():
+        yield from read_hardware_during_collection(
+            rotation_devices.aperture_scatterguard,
+            rotation_devices.attenuator,
+            rotation_devices.flux,
+            rotation_devices.dcm,
+            rotation_devices.eiger,
+        )
+
+    return plan()
+
+
+def fake_create_rotation_devices():
+    eiger = i03.eiger(fake_with_ophyd_sim=True)
+    smargon = i03.smargon(fake_with_ophyd_sim=True)
+    zebra = i03.zebra(fake_with_ophyd_sim=True)
+    detector_motion = i03.detector_motion(fake_with_ophyd_sim=True)
+    backlight = i03.backlight(fake_with_ophyd_sim=True)
+    attenuator = i03.attenuator(fake_with_ophyd_sim=True)
+    flux = i03.flux(fake_with_ophyd_sim=True)
+    undulator = i03.undulator(fake_with_ophyd_sim=True)
+    aperture_scatterguard = i03.aperture_scatterguard(fake_with_ophyd_sim=True)
+    synchrotron = i03.synchrotron(fake_with_ophyd_sim=True)
+    s4_slit_gaps = i03.s4_slit_gaps(fake_with_ophyd_sim=True)
+    dcm = i03.dcm(fake_with_ophyd_sim=True)
+    robot = i03.robot(fake_with_ophyd_sim=True)
+    oav = i03.oav(
+        fake_with_ophyd_sim=True,
+        params=OAVConfigParams(
+            zoom_params_file=ZOOM_LEVELS_XML, display_config=DISPLAY_CONFIGURATION
+        ),
+    )
+    xbpm_feedback = i03.xbpm_feedback(fake_with_ophyd_sim=True)
+
+    set_mock_value(smargon.omega.max_velocity, 131)
+    set_mock_value(dcm.energy_in_kev.user_readback, 12700)
+    oav.zoom_controller.fvst.sim_put("1.0x")  # type: ignore
+
+    return RotationScanComposite(
+        attenuator=attenuator,
+        backlight=backlight,
+        dcm=dcm,
+        detector_motion=detector_motion,
+        eiger=eiger,
+        flux=flux,
+        smargon=smargon,
+        undulator=undulator,
+        aperture_scatterguard=aperture_scatterguard,
+        synchrotron=synchrotron,
+        s4_slit_gaps=s4_slit_gaps,
+        zebra=zebra,
+        robot=robot,
+        oav=oav,
+        sample_shutter=i03.sample_shutter(fake_with_ophyd_sim=True),
+        xbpm_feedback=xbpm_feedback,
+    )
+
+
+def sim_rotation_scan_to_create_nexus(
+    test_params: RotationScan,
+    fake_create_rotation_devices: RotationScanComposite,
+    filename_stub,
+    RE,
+):
+    run_number = test_params.detector_params.run_number
+    nexus_filename = f"{filename_stub}_{run_number}.nxs"
+
+    fake_create_rotation_devices.eiger.bit_depth.sim_put(32)  # type: ignore
+
+    with patch(
+        "mx_bluesky.hyperion.external_interaction.nexus.write_nexus.get_start_and_predicted_end_time",
+        return_value=("test_time", "test_time"),
+    ):
+        RE(
+            fake_rotation_scan(
+                test_params, RotationNexusFileCallback(), fake_create_rotation_devices
+            )
+        )
+
+    nexus_path = Path(test_params.storage_directory) / nexus_filename
+    assert os.path.isfile(nexus_path)
+    return filename_stub, run_number
+
+
+def extract_metafile(input_filename, output_filename):
+    with gzip.open(input_filename) as metafile_fo:
+        with open(output_filename, "wb") as output_fo:
+            output_fo.write(metafile_fo.read())
+
+
+def _generate_fake_nexus(filename, dir=os.getcwd()):
+    RE = RunEngine({})
+    params = test_params(filename, dir)
+    run_number = params.detector_params.run_number
+    filename_stub, run_number = sim_rotation_scan_to_create_nexus(
+        params, fake_create_rotation_devices(), filename, RE
+    )
+    return filename_stub, run_number
+
+
+def generate_test_nexus():
+    filename_stub, run_number = _generate_fake_nexus(FILENAME_STUB)
+    # ugly hack because we get double free error on exit
+    with open("OUTPUT_FILENAME", "x") as f:
+        f.write(f"{filename_stub}_{run_number}.nxs")
+
+    extract_metafile(
+        str(TEST_DATA_DIRECTORY / TEST_METAFILE),
+        f"{FILENAME_STUB}_{run_number}_meta.h5",
+    )
+
+    new_hyp_data = [f"{FILENAME_STUB}_{run_number}_00000{n}.h5" for n in [1, 2, 3, 4]]
+    [shutil.copy(TEST_DATA_DIRECTORY / FAKE_DATAFILE, d) for d in new_hyp_data]
+
+    exit(0)
+
+
+def copy_test_meta_data_files():
+    extract_metafile(
+        str(TEST_DATA_DIRECTORY / TEST_METAFILE),
+        f"{TEST_DATA_DIRECTORY}/ins_8_5_meta.h5",
+    )
+    new_data = [f"{TEST_DATA_DIRECTORY}/ins_8_5_00000{n}.h5" for n in [1, 2, 3, 4]]
+    [shutil.copy(TEST_DATA_DIRECTORY / FAKE_DATAFILE, d) for d in new_data]
+
+
+if __name__ == "__main__":
+    generate_test_nexus()

mx_bluesky/jupyter_example.ipynb

@@ -41,9 +41,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from ophyd.sim import det, motor\n",
     "from bluesky.plans import scan\n",
-    "dets = [det]   # just one in this case, but it could be more than one\n",
+    "from ophyd.sim import det, motor\n",
+    "\n",
+    "dets = [det]  # just one in this case, but it could be more than one\n",
     "\n",
     "RE(scan(dets, motor, -1, 1, 10))"
    ]

{mx_bluesky-0.3.1.dist-info → mx_bluesky-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 0.3.1
+Version: 1.2.0
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License: Apache License
@@ -208,29 +208,42 @@ License: Apache License
 Project-URL: GitHub, https://github.com/DiamondLightSource/mx-bluesky
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: bluesky
-Requires-Dist: ophyd
-Requires-Dist: pyepics
+Requires-Dist: annotated-types
 Requires-Dist: caproto
+Requires-Dist: fastapi[all]
+Requires-Dist: flask-restful
+Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
-Requires-Dist: requests
+Requires-Dist: nexgen
+Requires-Dist: numpy
 Requires-Dist: opencv-python
+Requires-Dist: opentelemetry-distro
+Requires-Dist: opentelemetry-exporter-otlp
 Requires-Dist: pydantic
+Requires-Dist: pyepics
+Requires-Dist: pyzmq
+Requires-Dist: requests
+Requires-Dist: scanspec
+Requires-Dist: scipy
 Requires-Dist: semver
-Requires-Dist: fastapi[all]
-Requires-Dist: dls-dodal ==1.30.0
-Requires-Dist: blueapi ==0.4.4
+Requires-Dist: blueapi >=0.5.0
+Requires-Dist: daq-config-server >=0.1.1
+Requires-Dist: ophyd ==1.9.0
+Requires-Dist: ophyd-async >=0.3a5
+Requires-Dist: bluesky >=1.13.0a4
+Requires-Dist: dls-dodal ==1.33.0
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
-Requires-Dist: copier ; extra == 'dev'
+Requires-Dist: build ; extra == 'dev'
+Requires-Dist: diff-cover ; extra == 'dev'
 Requires-Dist: GitPython ; extra == 'dev'
+Requires-Dist: ipython ; extra == 'dev'
 Requires-Dist: mypy ; extra == 'dev'
 Requires-Dist: myst-parser ; extra == 'dev'
 Requires-Dist: pipdeptree ; extra == 'dev'
@@ -244,8 +257,10 @@ Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: ruff ; extra == 'dev'
 Requires-Dist: sphinx-autobuild ; extra == 'dev'
 Requires-Dist: sphinx-copybutton ; extra == 'dev'
+Requires-Dist: sphinxcontrib-plantuml ; extra == 'dev'
 Requires-Dist: sphinx-design ; extra == 'dev'
 Requires-Dist: tox-direct ; extra == 'dev'
+Requires-Dist: tox ; extra == 'dev'
 Requires-Dist: types-mock ; extra == 'dev'
 Requires-Dist: types-requests ; extra == 'dev'
 

mx_bluesky-1.2.0.dist-info/RECORD

@@ -0,0 +1,140 @@
+mx_bluesky/__init__.py,sha256=twUymKa_5teVCbYPgxRDu87WyQhJa8nMRb8HLTCFJZ8,115
+mx_bluesky/__main__.py,sha256=bmFrxcsN8zGadkDLRnE3qV3-iXJcEWVPp5GNx2rsTJ0,383
+mx_bluesky/_version.py,sha256=zMnMemknXglcJs59xkicNzeEJTVgYd1omSfLWj76yWw,411
+mx_bluesky/example.py,sha256=_zBoGrKAI1ReOvBz51F9PDorKWQufrb0_ydmoqJ2UAA,478
+mx_bluesky/jupyter_example.ipynb,sha256=wpwvPrBvwtRMS5AIFk8F54cIlUoD0o4ji8tKK5cZHA4,1672
+mx_bluesky/beamlines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i04/__init__.py,sha256=jZjAMN5_oOEjQoR3iTrnMFW3ElxlHhQ7pEQZIv21Y4I,129
+mx_bluesky/beamlines/i04/thawing_plan.py,sha256=hOYC8Hd3o5ZzFBD2Qwo6AIud4ev_RsWpJjTx63zIwY4,3517
+mx_bluesky/beamlines/i04/callbacks/murko_callback.py,sha256=tq7dWDoTonuJZCTfrq6dBs7eOgCql88lnMOwRQCCP_o,1701
+mx_bluesky/beamlines/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i24/serial/__init__.py,sha256=Jfc9eLVRgPIai_Sob8E4yn35-PTKYajZX7PmQUeDNwM,1096
+mx_bluesky/beamlines/i24/serial/blueapi_config.yaml,sha256=gwOfjzZMbcvpVH71CCyHaxr8hgPYCJIWWWfg1zErtmM,245
+mx_bluesky/beamlines/i24/serial/dcid.py,sha256=Yv9SkRf1any4WVG6zI3jUxjgzQdBOKdV3XkdKZl8hto,15172
+mx_bluesky/beamlines/i24/serial/log.py,sha256=dsyu062WhFmHgr4rnjICT7P-6-IspjsySkH5jXt9svw,4331
+mx_bluesky/beamlines/i24/serial/run_extruder.sh,sha256=Rujzmh3J6VZ7ZiupK5MVWJsCp0a4Z9Oh3eR64-v1F1Y,436
+mx_bluesky/beamlines/i24/serial/run_fixed_target.sh,sha256=BMpmLWbBpWNOFC5lYhEUw06DJIoq8KeIOJQDZuT_qVo,585
+mx_bluesky/beamlines/i24/serial/run_serial.py,sha256=0hIDSy60G4DQuokX9f4RgxWtGVCpRLJc5zU1Fj1m0-Q,940
+mx_bluesky/beamlines/i24/serial/run_ssx.sh,sha256=0Ir5iQQ-xSN_5teHtxzht6G-mJ08mE1gxBS32vkh1eM,714
+mx_bluesky/beamlines/i24/serial/set_visit_directory.sh,sha256=WuN5PUBxTofzuESk1-3gWtTcbPjOx-26JaQSVCsZhZs,1660
+mx_bluesky/beamlines/i24/serial/start_blueapi.sh,sha256=4iBzQljTLXQiVIF4UO7drc9qUkP7KSRC6Mjh8hcGxpI,608
+mx_bluesky/beamlines/i24/serial/write_nexus.py,sha256=qRLGfrerYnlLUdyDxAso5VPI1PlFUh9gSw0bRcp8GiQ,4050
+mx_bluesky/beamlines/i24/serial/extruder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py,sha256=ePfyCvr0-8xD0X8K_I1mhQFVb4t9HYYTFd4PxJaqHvo,17900
+mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DetStage.edl,sha256=9L1CgEdxZD4N3QvM5HLlAlJTcxpzd4ahB2nVJ9jHujw,2013
+mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl,sha256=k7b_91X5VQEmlHI2DrOmuNXTTMLcvlyJICo6F19h61I,31289
+mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/microdrop_alignment.edl,sha256=K79vmGAcf9qVEQLXTgr0g4bZDWaJ7nFoK4e0Ex7qAwM,14690
+mx_bluesky/beamlines/i24/serial/fixed_target/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/beamlines/i24/serial/fixed_target/ft_utils.py,sha256=cLZBEN-PK_7V6T5mjaHv53xa3rvKBStD4g-GUqCjkOM,1223
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py,sha256=m1OU17bBw8hn4QBgSZ6lZu4qqShsP4abEfhK3SBN-l8,28600
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py,sha256=WgT-ffr98JjSHPLCZu_JgYkIsc3TvAk7KEQXDvOJ5_E,35311
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py,sha256=eTspHh6cB8cgT5eYyAC_27r4UJ9xgXk1x67KtnEQ81A,5252
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py,sha256=lTJ9h7vqJA9NjrE73To2IsSVVXrS1ghyeCVvOrhUQzM,10843
+mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py,sha256=H9BfhEu3fhiI0P5lwKu9Zt83Lo6KpCXl38jQimu58TU,6298
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/CustomChip_py3v1.edl,sha256=H9BVU1S3oy8tAVHtKvJvp7YTHA-4X-jtOtiu3jJ7of4,10348
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DetStage.edl,sha256=WBji5SaRQ5e0KFRgrPuv6IgaFxkal1jh7MZW8SqQN88,2016
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl,sha256=yT91wdAQ7sJsoniEc5yGKEiHSFQOGtf2oXjbMS3IavE,56602
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/ME14E-GeneralPurpose.edl,sha256=cpKpXfU668mGjIz35jUMTF8KAi0RI7WlVO2AR-EnJ8U,60868
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl,sha256=CPMPU-imtWeKERXydJn30svgx-s2u6SuuamsFRsstyM,38860
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/PMAC_Command.edl,sha256=2KUy2iEcX9AC07zSH3Sp97b5qauGIm8_HjvoQ4pkyCU,1417
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/Shutter_Control.edl,sha256=o2PDoIFzeErIUijDbGdfWdrh3wd5GFAqEsDD2at2a4k,1601
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/microdrop_alignment.edl,sha256=8TWQTIBnX3OLa1kjsibsCnG5wCVotPYIOHwFam7rJe4,14679
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/nudgechip.edl,sha256=IgLLF7gcNoG8Z4t9FTA7_4ggUccNm6-ekK5bb0V4ekY,15711
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl,sha256=CrCo1nSIzT3OcSy4OXq1vu4lz5OvI4U8-yl-ruQ57m4,22665
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short1-laser.png,sha256=wDNuKCa_8hUPy4W01vdIrfdZtCyQKT8qVS5AS6kOTmo,9740
+mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/short2-laser.png,sha256=MrdiCFX7j-ODkfSdzc4NQ_8hj2Gs8i9gQqWyNXvdM5s,10189
+mx_bluesky/beamlines/i24/serial/parameters/__init__.py,sha256=oyY7qXs1dDTzE2DNiPdZIzMoDWfghujygEWCQa7YozA,434
+mx_bluesky/beamlines/i24/serial/parameters/constants.py,sha256=w20hRzHoUGeJJ3hECtALEheEz60rt-Ffi4boiYkhu50,1494
+mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py,sha256=UO5t7Pmx-yyXiQSWKmb8mQPbrZ70RCLbHcPRqtdDMaU,2771
+mx_bluesky/beamlines/i24/serial/parameters/utils.py,sha256=IR1ulMWW0PEoF-kddqXtFVm8MoA7oB_MbS0XO7a-k4w,2118
+mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json,sha256=n8FxMtq3iFsbG3IIrFmgQWDdnG_BsFXZ_P40Z7wIuE4,142
+mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/motor_direction.txt,sha256=oIPpcQpqCrKz5dPZ-qQ5gQ2Sdqtj6nsnf66pN8PGU50,199
+mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/minichip-oxford.pvar,sha256=SN4deU199dMcA1Bcx1BF6CBMvoSszxJWZC6vt7_5fHc,284
+mx_bluesky/beamlines/i24/serial/parameters/fixed_target/pvar_files/oxford.pvar,sha256=pZbFOEiN_S5yiTEtqdNHmTMtnQY-W2ImXVBYCovPCx0,1842
+mx_bluesky/beamlines/i24/serial/setup_beamline/__init__.py,sha256=UhBdMcPdJMzwV0d8DKOBzvYNd6TDSwcP9GJVqfGa7Jc,261
+mx_bluesky/beamlines/i24/serial/setup_beamline/ca.py,sha256=HdU4OUAT2du7cPfIssMjUNvIe9jQQChvCwnkiTw1_aA,1590
+mx_bluesky/beamlines/i24/serial/setup_beamline/pv.py,sha256=Wen5tTUBggb5Gf4f2yar5Rkn0GbkLRpKu6rbbFb6qPM,15566
+mx_bluesky/beamlines/i24/serial/setup_beamline/pv_abstract.py,sha256=WbD5ghgTG0F3-MR0XYm4nkiKYswVP5a2COYx_k_cngE,1806
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py,sha256=MqMaoDU_O8Zny9Lq1WUn1-EEEZx0nQKVwHaOHMTdW2I,18352
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_detector.py,sha256=odNDKReW01GZ2C_yxPzkhUjZEl45jeRxzcfDlSZnZ4g,3365
+mx_bluesky/beamlines/i24/serial/setup_beamline/setup_zebra_plans.py,sha256=dzkml6AbJovQr4znygV4yg2wrUffNQcRpgAQqGx0siY,17019
+mx_bluesky/hyperion/__init__.py,sha256=f4E8wInL1Ll4eeFtAiyKmipOBTPlUtKmVK-m_LOQG4M,35
+mx_bluesky/hyperion/__main__.py,sha256=UwvVJlDTb42CZIh1HjlOlSV26OYr0Op9zQGGIW8iO2s,13600
+mx_bluesky/hyperion/exceptions.py,sha256=RUKfRG8V4TZY6dQFg1tISbUOG0p3cG-LUJdWkc32_5s,1298
+mx_bluesky/hyperion/log.py,sha256=WClOd2edCk3kxisMcQgFQucDc1K04UYcCiBVf3jfhqs,2909
+mx_bluesky/hyperion/tracing.py,sha256=rmHtH74WKUxn_Y73YIo7ogDgKakUTwvLtuasq1ocf2c,1139
+mx_bluesky/hyperion/device_setup_plans/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py,sha256=sO11UoCkUDd1pN6kSBl4ydE4eXnBnIyF516ir898Pig,4639
+mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py,sha256=vJdlTs9LILfkifqNcn15sQgG4_OJbK30v70YzJq0B8c,3217
+mx_bluesky/hyperion/device_setup_plans/position_detector.py,sha256=g2gJZFqOF2klH92uKQAMoyXRSD7ehloe9wToIVfV-CM,631
+mx_bluesky/hyperion/device_setup_plans/read_hardware_for_setup.py,sha256=Syn1fmk90tGcC_ekhQUUwQVvTxAnIUlc97X9arFIpNQ,2115
+mx_bluesky/hyperion/device_setup_plans/setup_oav.py,sha256=LkhhcAyiNiTpeHCzW7vbz86PpnaoKGbcqym5ne4kcoc,2856
+mx_bluesky/hyperion/device_setup_plans/setup_panda.py,sha256=ZnH2hTMR-Q35D0Gu00cwr-aobIRrfRxoQKW3A0j3fk4,7783
+mx_bluesky/hyperion/device_setup_plans/setup_zebra.py,sha256=rzzxU1d3ahe5tIk0h2TULvabKlY57OhrtO4mM8oKyuc,8049
+mx_bluesky/hyperion/device_setup_plans/smargon.py,sha256=sSqrURldwwqPvbS-y7y-9Y1LM6Rq3AO0JgA9cHCPais,788
+mx_bluesky/hyperion/device_setup_plans/utils.py,sha256=5xuz4SFYfAA14pvYycvw3zQiwUq2_gscn3LiTdKRz8M,1813
+mx_bluesky/hyperion/device_setup_plans/xbpm_feedback.py,sha256=tx9Sl3LMw4r9ls8J8TGf6COz__ISgLjJaEpInzlmnP8,3679
+mx_bluesky/hyperion/experiment_plans/__init__.py,sha256=Tq9XXh8-N4obZMizxi5H1laV-toJQ9olu4K05gMFo8E,936
+mx_bluesky/hyperion/experiment_plans/experiment_registry.py,sha256=n7A0yK4ftpwB0GoNop4ZM1jcFvdqEQuq6qLabzprLKo,2995
+mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py,sha256=mGxz_6rMR3_z9hihP-e_DDtWzMulxdJrgIU2qoWGNEc,19321
+mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py,sha256=C03cKIQLyDAeGnI05tW6Z2kzItTIfHL_wlXqd0X8TcM,7186
+mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py,sha256=vmqqlZANQB9LAl9QgMNmGU3yB624_gMuM7pJlglPOOc,1711
+mx_bluesky/hyperion/experiment_plans/oav_grid_detection_plan.py,sha256=lzkC1mZCuXW_GmGhgWeTjKGTgAP1uqNWlcEpY5_dOgc,6943
+mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py,sha256=7OcQ3nm7m-xLdPkct41-HrrQKrs9q_U8qOy80QqhnFg,2821
+mx_bluesky/hyperion/experiment_plans/optimise_attenuation_plan.py,sha256=JZJW3hOzcxFyCEmsMYWWGwA9tAgGgg85nBKxBxKXeX0,16276
+mx_bluesky/hyperion/experiment_plans/pin_centre_then_xray_centre_plan.py,sha256=vV9UOubh2v6clL4LHFSQhqVBGcKPaNVWqK2rDrdPcQI,4146
+mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py,sha256=YcGGckesXe_5NhaIEd0SFOPbtTYkpDKLSi3g7_2d52o,5969
+mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py,sha256=jogvdhNYIb5B2dZihPX3EgL_o3iFUYMTNumNWZNRHRI,7802
+mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py,sha256=lIGqj_ugGUfiS-1eTbO_5Q6MRfhA5QgINbUvY9JMhjI,5422
+mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py,sha256=iYsLw3nlIlpdccK1EeWH1S7nN1JoINvVxNRfZG52DE4,15802
+mx_bluesky/hyperion/experiment_plans/set_energy_plan.py,sha256=sBCwDxtBb-XzWPIYeIOqjKSeeOmdLzDvDihONA_Qcwg,1729
+mx_bluesky/hyperion/external_interaction/__init__.py,sha256=95DwXDmKsx36RgAL-AtLZl2LQoLPKbzeYdlkkP_4Coc,559
+mx_bluesky/hyperion/external_interaction/config_server.py,sha256=hA5r4v071gkV91F9YPwTVQGLPq3iMb1pjcBEE14Uxh4,1077
+mx_bluesky/hyperion/external_interaction/exceptions.py,sha256=XBDES13VaW9fhxRZYNvSfLC_Mvg4M4RqMseW_u18Mb8,342
+mx_bluesky/hyperion/external_interaction/callbacks/__init__.py,sha256=njGhxi0Qf06vvDXCpVlQhFAOebf6iVAVm3CjGCjwr1g,331
+mx_bluesky/hyperion/external_interaction/callbacks/__main__.py,sha256=Ke_3nKJXOnPu06rq3r9oULoTqgfwfbQYQgt5GDEidYE,4860
+mx_bluesky/hyperion/external_interaction/callbacks/aperture_change_callback.py,sha256=pWd84QldTGLoxPdyqXZk6_SLhvF7O-CQRsiXqWDQEkg,837
+mx_bluesky/hyperion/external_interaction/callbacks/grid_detection_callback.py,sha256=tWtbpdq3dcTpoVpuDIeSAf-naziky38wgMeW6S1Dh7c,2914
+mx_bluesky/hyperion/external_interaction/callbacks/ispyb_callback_base.py,sha256=ynztJNtM-Njs_kTIFI6aM1YzcX7TK3c_7p4gge2QUCg,8875
+mx_bluesky/hyperion/external_interaction/callbacks/log_uid_tag_callback.py,sha256=MnpHKTwBbI5_xDtm5VK1cSObrfkWBuWP0_OXnU1qQCA,622
+mx_bluesky/hyperion/external_interaction/callbacks/logging_callback.py,sha256=W5jO7uHvi84FmEwVC_wNk93oc3-SJ8pZq61cYS-qalU,708
+mx_bluesky/hyperion/external_interaction/callbacks/plan_reactive_callback.py,sha256=7UtkXZluAag_Mx_JnESd7ODPSN3WrcNCgN8mquIpxjE,4086
+mx_bluesky/hyperion/external_interaction/callbacks/zocalo_callback.py,sha256=Jwf_jFLnC1lRm-WIlZ6ZozbQyw_SHtXK_5HUA5RT7Fw,3960
+mx_bluesky/hyperion/external_interaction/callbacks/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py,sha256=CjB3SOITmwv9I7pokwN0pmPomDAri7fJrg7Ww2kpXPo,1981
+mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py,sha256=g7g_YmW3ZqFSN_uIXV-gONoMWS_mrQUdv51vJ2UOe0s,2584
+mx_bluesky/hyperion/external_interaction/callbacks/robot_load/ispyb_callback.py,sha256=R60oJdMwx8l0qqfRoyNrcj7Qg0fL0VU9IDm0YzR8xi0,3580
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py,sha256=tYc5B1UN8K_69rRBhx1KjpLv_r6htRJxjG05sAIFKvg,7220
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_mapping.py,sha256=gXub8lt04ClC4sU_QGaBW4w3wrH8hJK7Tjy0AY4zf7g,718
+mx_bluesky/hyperion/external_interaction/callbacks/rotation/nexus_callback.py,sha256=tx7G1Q9W3bCLB1h_IaNh1FvOmsE2Oy9LJMLC8NSWgCc,4478
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py,sha256=kyEu2SXyN6kL4fcQm3HmAO4KEdEZvBH_7cDX9gEeyqw,11294
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/ispyb_mapping.py,sha256=8SiT3Yes58HJNro4CatIM1dcnyIvTBt0DNtAGbcEx7g,1818
+mx_bluesky/hyperion/external_interaction/callbacks/xray_centre/nexus_callback.py,sha256=FvO6OcRgQNBm8HEeM6Gc-j2a1yH3OOGUat-GTtfh-gM,4409
+mx_bluesky/hyperion/external_interaction/ispyb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/ispyb/data_model.py,sha256=7P2Tz3Y9k-vKSGsdk8ppvKg15z1iBGGKbw3RNv_8y-E,2632
+mx_bluesky/hyperion/external_interaction/ispyb/exp_eye_store.py,sha256=ekMaDRkshbC72_hY0VWjaBA5b1vQgUfHoYBW22wEzNw,4487
+mx_bluesky/hyperion/external_interaction/ispyb/ispyb_store.py,sha256=K71lAHoqMBh-ayqFdfafIwRd8AIqnyj6LR6rzk00nl8,10318
+mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py,sha256=2Vl5qvGoCvbZ-lJFJSSNpTkbE4YfHAhy79jP7Oap6gg,720
+mx_bluesky/hyperion/external_interaction/nexus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mx_bluesky/hyperion/external_interaction/nexus/nexus_utils.py,sha256=dVeKUc92TQcO1rpssqTsufwzlIdlHUu2e6zWm4mUYqs,5131
+mx_bluesky/hyperion/external_interaction/nexus/write_nexus.py,sha256=L67UUdauzbXqsf2GJveGT6NP5YxbSzvcD0RjK5zrErI,4136
+mx_bluesky/hyperion/parameters/__init__.py,sha256=kf2wfcILBUBpT0tJ8-W39BywQUkn67yxl9IVsfrr1LE,115
+mx_bluesky/hyperion/parameters/cli.py,sha256=FGzvEB76YnQvBydUMPUNHJuqxvEe7Zc627w7gA2KODY,2125
+mx_bluesky/hyperion/parameters/components.py,sha256=ayIH6QLX15Qeebbz5W66kXUpLpH70JuwdF2E3YyjEmE,7171
+mx_bluesky/hyperion/parameters/constants.py,sha256=U21htONRj9Tvr7nyRbnrSyW6SRAADIkS0wLU0A3gvUQ,4458
+mx_bluesky/hyperion/parameters/gridscan.py,sha256=eTBsjMmzRpS5BacbDmRhH4uncLS96EKrMgKQ1u4Chpg,8310
+mx_bluesky/hyperion/parameters/load_centre_collect.py,sha256=Q0TpVoAZeqPvRBayWPacU3wOWdawmlqhB7361xRKVvc,1583
+mx_bluesky/hyperion/parameters/robot_load.py,sha256=nWiFrakYIn55Y9FDM10TN3Leq5TsAVFpDfY59FU3pIw,435
+mx_bluesky/hyperion/parameters/rotation.py,sha256=HP25ZPlM0U7rRsUxUQFvBPs5pI5NWE2PHSlCg3fI_2Y,5602
+mx_bluesky/hyperion/resources/panda/panda-gridscan.yaml,sha256=xrhgok-9X2VXdyLEWiYOUEeRCBqhYM6IJFAefnNdgzw,26521
+mx_bluesky/hyperion/utils/context.py,sha256=TYG3e4lu88ssngoNbsR5pfEXI0DveDemLWaBuThtvbI,2710
+mx_bluesky/hyperion/utils/utils.py,sha256=GoxupsUcAhGg0TmK_KMgGSB2rDDSd8tV5zGGLOfiAKk,731
+mx_bluesky/hyperion/utils/validation.py,sha256=Cw8TDODble039-lqnSUmFu01p9jdgf-bchcTkByRxok,6569
+mx_bluesky-1.2.0.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+mx_bluesky-1.2.0.dist-info/METADATA,sha256=6yz0owOp839jruq_KMLvJ2WlDWnlHZ1pgz7mLenyKKI,17163
+mx_bluesky-1.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mx_bluesky-1.2.0.dist-info/entry_points.txt,sha256=Bt3iHCqzZtHYnnSKoh_qM2k3K4LbK1Uxr0gF8B34F98,528
+mx_bluesky-1.2.0.dist-info/top_level.txt,sha256=S4rrzXIUef58ulf_04wn01XGZ3xeJjXs4LPEJ_xoF-I,11
+mx_bluesky-1.2.0.dist-info/RECORD,,

{mx_bluesky-0.3.1.dist-info → mx_bluesky-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mx_bluesky-1.2.0.dist-info/entry_points.txt

@@ -0,0 +1,8 @@
+[console_scripts]
+hyperion = mx_bluesky.hyperion.__main__:main
+hyperion-callbacks = mx_bluesky.hyperion.external_interaction.callbacks.__main__:main
+hyperion-generate-test-nexus = mx_bluesky.hyperion.utils.validation:generate_test_nexus
+hyperion-populate-test-and-meta-files = mx_bluesky.hyperion.utils.validation:copy_test_meta_data_files
+mx-bluesky = mx_bluesky.__main__:main
+run_extruder = mx_bluesky.beamlines.i24.serial.run_serial:run_extruder
+run_fixed_target = mx_bluesky.beamlines.i24.serial.run_serial:run_fixed_target

mx_bluesky/i04/__init__.py

@@ -1,3 +0,0 @@
-from mx_bluesky.i04.thawing_plan import thaw, thaw_and_center
-
-__all__ = ["thaw", "thaw_and_center"]

mx_bluesky/i24/serial/parameters/__init__.py

@@ -1,15 +0,0 @@
-from mx_bluesky.i24.serial.parameters.constants import SSXType
-from mx_bluesky.i24.serial.parameters.experiment_parameters import (
-    ChipDescription,
-    ExtruderParameters,
-    FixedTargetParameters,
-)
-from mx_bluesky.i24.serial.parameters.utils import get_chip_format
-
-__all__ = [
-    "SSXType",
-    "ExtruderParameters",
-    "ChipDescription",
-    "FixedTargetParameters",
-    "get_chip_format",
-]

mx_bluesky/parameters/__init__.py

@@ -1,31 +0,0 @@
-from .components import (
-    DiffractionExperiment,
-    IspybExperimentType,
-    OptionalGonioAngleStarts,
-    OptionalXyzStarts,
-    ParameterVersion,
-    RotationAxis,
-    SplitScan,
-    WithOavCentring,
-    WithSample,
-    WithScan,
-    WithSnapshot,
-    XyzAxis,
-    XyzStarts,
-)
-
-__all__ = [
-    "DiffractionExperiment",
-    "IspybExperimentType",
-    "OptionalGonioAngleStarts",
-    "OptionalXyzStarts",
-    "ParameterVersion",
-    "RotationAxis",
-    "SplitScan",
-    "WithOavCentring",
-    "WithSample",
-    "WithScan",
-    "WithSnapshot",
-    "XyzAxis",
-    "XyzStarts",
-]