UI plans for JungFrau

pyproject.toml

@@ -208,7 +208,7 @@ commands = [
 description = "Run tests with coverage"
 commands = [
     [
-        "pytest", 
+        "pytest",
         "--cov=mx_bluesky",
         "--cov-report",
         "term",
@@ -245,7 +245,7 @@ setenv = [
 ]
 commands = [
     [
-        "pytest", 
+        "pytest",
         "-m",
         "system_test",
         "--timeout=60",

src/mx_bluesky/beamlines/i24/jungfrau_commissioning/utility_plans.py

@@ -0,0 +1,14 @@
+import bluesky.plan_stubs as bps
+
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.composites import (
+    RotationScanComposite,
+)
+from mx_bluesky.beamlines.i24.parameters.constants import PlanNameConstants
+
+
+def read_devices_for_metadata(composite: RotationScanComposite):
+    yield from bps.create(PlanNameConstants.ROTATION_META_READ)
+    yield from bps.read(composite.dcm.energy_in_kev)
+    yield from bps.read(composite.dcm.wavelength_in_a)
+    yield from bps.read(composite.det_stage.z)
+    yield from bps.save()

src/mx_bluesky/beamlines/i24/parameters/rotation.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from pydantic import field_validator
+
+from mx_bluesky.common.parameters.rotation import SingleRotationScan
+
+
+class MultiRotationScanByTransmissions(SingleRotationScan):
+    transmission_fractions: list[float]
+    transmission_frac: float = -1
+
+    @field_validator("transmission_frac")
+    @classmethod
+    def validate_transmission_frac(cls, val):
+        if val != -1:
+            raise ValueError(
+                "The transmission_fractions field must be specified instead of the transmission_frac when using MultiRotationScanByTransmissions parameters"
+            )
+        return val

src/mx_bluesky/beamlines/i24/serial/__init__.py

@@ -1,3 +1,6 @@
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.experiment_plans.do_darks import (
+    do_pedestal_darks,
+)
 from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
     gui_gonio_move_on_click,
     gui_move_backlight,
@@ -32,6 +35,10 @@
 )
 from .log import clean_up_log_config_at_end, setup_collection_logs
 from .setup_beamline.setup_detector import setup_detector_stage
+from .web_gui_plans.jungfrau_plans import (
+    run_multi_rotation_plan,
+    run_single_rotation_plan,
+)
 
 __all__ = [
     "setup_detector_stage",
@@ -63,4 +70,8 @@
     "gui_set_zoom_level",
     "gui_set_fiducial_0",
     "gui_run_extruder_collection",
+    # Jungfrau
+    "do_pedestal_darks",
+    "run_single_rotation_plan",
+    "run_multi_rotation_plan",
 ]

src/mx_bluesky/beamlines/i24/serial/web_gui_plans/jungfrau_plans.py

@@ -0,0 +1,153 @@
+import bluesky.preprocessors as bpp
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
+from dodal.devices.hutch_shutter import HutchShutter
+from dodal.devices.i24.aperture import Aperture
+from dodal.devices.i24.beamstop import Beamstop
+from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.i24.dcm import DCM
+from dodal.devices.i24.dual_backlight import DualBacklight
+from dodal.devices.i24.vgonio import VerticalGoniometer
+from dodal.devices.motors import YZStage
+from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.xbpm_feedback import XBPMFeedback
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
+
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.composites import (
+    RotationScanComposite,
+)
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.experiment_plans.rotation_scan_plan import (
+    multi_rotation_plan_varying_transmission,
+    single_rotation_plan,
+)
+from mx_bluesky.beamlines.i24.parameters.rotation import (
+    MultiRotationScanByTransmissions,
+)
+from mx_bluesky.common.parameters.rotation import SingleRotationScan
+
+PARAM_MODEL_VERSION = "5.0.0"
+BEAMLINE = "BL24I"
+
+
+@bpp.run_decorator()
+def run_single_rotation_plan(
+    exposure_time_s: float,
+    omega_start_deg: float,
+    omega_increment_deg: float,
+    total_scan_width_deg: float,
+    detector_distance_mm: float,
+    shutter_opening_time_s: float,
+    visit: str,
+    file_name: str,
+    storage_directory: str,
+    transmission: float,
+    aperture: Aperture = inject("aperture"),
+    attenuator: EnumFilterAttenuator = inject("attenuator"),
+    jungfrau: CommissioningJungfrau = inject("commissioning_jungfrau"),
+    gonio: VerticalGoniometer = inject("vgonio"),
+    synchrotron: Synchrotron = inject("synchrotron"),
+    sample_shutter: ZebraShutter = inject("sample_shutter"),
+    zebra: Zebra = inject("zebra"),
+    xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"),
+    hutch_shutter: HutchShutter = inject("shutter"),
+    beamstop: Beamstop = inject("beamstop"),
+    detector_stage: YZStage = inject("detector_motion"),
+    backlight: DualBacklight = inject("backlight"),
+    dcm: DCM = inject("dcm"),
+) -> MsgGenerator:
+    composite = RotationScanComposite(
+        aperture,
+        attenuator,
+        jungfrau,
+        gonio,
+        synchrotron,
+        sample_shutter,
+        zebra,
+        xbpm_feedback,
+        hutch_shutter,
+        beamstop,
+        detector_stage,
+        backlight,
+        dcm,
+    )
+    parameters = SingleRotationScan(
+        exposure_time_s=exposure_time_s,
+        omega_start_deg=omega_start_deg,
+        rotation_increment_deg=omega_increment_deg,
+        scan_width_deg=total_scan_width_deg,
+        detector_distance_mm=detector_distance_mm,
+        visit=visit,
+        file_name=file_name,
+        storage_directory=storage_directory,
+        shutter_opening_time_s=shutter_opening_time_s,
+        transmission_frac=transmission,
+        parameter_model_version=PARAM_MODEL_VERSION,
+        beamline="BL24I",
+        sample_id=0,
+        snapshot_directory=None,
+    )
+
+    yield from single_rotation_plan(composite, parameters)
+
+
+@bpp.run_decorator()
+def run_multi_rotation_plan(
+    exposure_time_s: float,
+    omega_start_deg: float,
+    omega_increment_deg: float,
+    total_scan_width_deg: float,
+    detector_distance_mm: float,
+    shutter_opening_time_s: float,
+    visit: str,
+    file_name: str,
+    storage_directory: str,
+    transmission_fractions: list[float],
+    aperture: Aperture = inject("aperture"),
+    attenuator: EnumFilterAttenuator = inject("attenuator"),
+    jungfrau: CommissioningJungfrau = inject("commissioning_jungfrau"),
+    gonio: VerticalGoniometer = inject("vgonio"),
+    synchrotron: Synchrotron = inject("synchrotron"),
+    sample_shutter: ZebraShutter = inject("sample_shutter"),
+    zebra: Zebra = inject("zebra"),
+    xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"),
+    hutch_shutter: HutchShutter = inject("shutter"),
+    beamstop: Beamstop = inject("beamstop"),
+    detector_stage: YZStage = inject("detector_motion"),
+    backlight: DualBacklight = inject("backlight"),
+    dcm: DCM = inject("dcm"),
+) -> MsgGenerator:
+    composite = RotationScanComposite(
+        aperture,
+        attenuator,
+        jungfrau,
+        gonio,
+        synchrotron,
+        sample_shutter,
+        zebra,
+        xbpm_feedback,
+        hutch_shutter,
+        beamstop,
+        detector_stage,
+        backlight,
+        dcm,
+    )
+    params = MultiRotationScanByTransmissions(
+        exposure_time_s=exposure_time_s,
+        omega_start_deg=omega_start_deg,
+        rotation_increment_deg=omega_increment_deg,
+        scan_width_deg=total_scan_width_deg,
+        detector_distance_mm=detector_distance_mm,
+        visit=visit,
+        file_name=file_name,
+        storage_directory=storage_directory,
+        shutter_opening_time_s=shutter_opening_time_s,
+        transmission_frac=-1,
+        transmission_fractions=transmission_fractions,
+        parameter_model_version=PARAM_MODEL_VERSION,
+        beamline="BL24I",
+        sample_id=0,
+        snapshot_directory=None,
+    )
+    yield from multi_rotation_plan_varying_transmission(composite, params)

src/mx_bluesky/common/parameters/components.py

@@ -12,6 +12,7 @@
     DetectorParams,
     TriggerMode,
 )
+from dodal.utils import get_beamline_name
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -32,6 +33,8 @@
 
 PARAMETER_VERSION = Version.parse("5.3.0")
 
+BL = get_beamline_name("i03")
+
 
 def get_param_version() -> SemanticVersion:
     return SemanticVersion.validate_from_str(str(PARAMETER_VERSION))

tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py

@@ -913,7 +913,7 @@ def test_rotation_scan_moves_beamstop_into_place(
     MagicMock(),
 )
 @patch(
-    "mx_bluesky.hyperion.experiment_plans.rotation_scan_plan.setup_zebra_for_rotation"
+    "mx_bluesky.common.device_setup_plans.setup_zebra_and_shutter.setup_zebra_for_rotation"
 )
 def test_rotation_scan_plan_with_omega_flip_inverts_motor_movements_but_not_event_params(
     mock_setup_zebra_for_rotation: MagicMock,