dls-dodal 1.67.0__py3-none-any.whl → 1.69.0__py3-none-any.whl

dodal/beamlines/i09_2.py

@@ -10,10 +10,10 @@ from dodal.devices.i09.enums import Grating
 from dodal.devices.i09_2_shared.i09_apple2 import (
     J09_GAP_POLY_DEG_COLUMNS,
     J09_PHASE_POLY_DEG_COLUMNS,
-    J09Apple2Controller,
 )
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
+    Apple2EnforceLHMoveController,
     BeamEnergy,
     InsertionDeviceEnergy,
     InsertionDevicePolarisation,
@@ -70,18 +70,18 @@ def jid_phase() -> UndulatorPhaseAxes:
 
 
 @device_factory()
-def jid() -> Apple2:
+def jid() -> Apple2[UndulatorPhaseAxes]:
     """I09 soft x-ray insertion device."""
-    return Apple2(
+    return Apple2[UndulatorPhaseAxes](
         id_gap=jid_gap(),
         id_phase=jid_phase(),
     )
 
 
 @device_factory()
-def jid_controller() -> J09Apple2Controller:
+def jid_controller() -> Apple2EnforceLHMoveController[UndulatorPhaseAxes]:
     """J09 insertion device controller."""
-    return J09Apple2Controller(
+    return Apple2EnforceLHMoveController[UndulatorPhaseAxes](
         apple2=jid(),
         gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
             lut_config=LookupTableColumnConfig(poly_deg=J09_GAP_POLY_DEG_COLUMNS),
@@ -93,6 +93,7 @@ def jid_controller() -> J09Apple2Controller:
             config_client=J09_CONF_CLIENT,
             path=Path(LOOK_UPTABLE_DIR, PHASE_LOOKUP_FILE_NAME),
         ),
+        units="keV",
     )
 
 

dodal/beamlines/i10_optics.py

@@ -26,7 +26,7 @@ from dodal.devices.i10.i10_apple2 import (
 
 # Imports taken from i10 while we work out how to deal with split end stations
 from dodal.devices.i10.i10_setting_data import I10Grating
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     BeamEnergy,
     InsertionDeviceEnergy,
     InsertionDevicePolarisation,

dodal/beamlines/i16.py

@@ -0,0 +1,34 @@
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
+from dodal.devices.temperture_controller import Lakeshore336, Lakeshore340
+from dodal.devices.undulator import UndulatorInMm, UndulatorOrder
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i16")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+PREFIX = BeamlinePrefix(BL)
+
+
+devices = DeviceManager()
+
+
+@devices.factory()
+def id() -> UndulatorInMm:
+    return UndulatorInMm(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@devices.factory()
+def harmonic() -> UndulatorOrder:
+    return UndulatorOrder()
+
+
+@devices.factory()
+def lakeshore340() -> Lakeshore340:
+    return Lakeshore340(prefix=f"{PREFIX.beamline_prefix}-EA-LS340-01:")
+
+
+@devices.factory()
+def lakeshore336() -> Lakeshore336:
+    return Lakeshore336(prefix=f"{PREFIX.beamline_prefix}-EA-LS336-01:")

dodal/beamlines/i17.py

@@ -8,7 +8,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.i17.i17_apple2 import I17Apple2Controller
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.insertion_device import (
     Apple2,
     Apple2Controller,
     BeamEnergy,

dodal/beamlines/i20_1.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.motor import Motor
+from ophyd_async.epics.pmac import PmacIO
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
@@ -58,6 +59,19 @@ def turbo_slit_x() -> Motor:
     return Motor(f"{PREFIX.beamline_prefix}-OP-PCHRO-01:TS:XFINE")
 
 
+@device_factory()
+def turbo_slit_pmac() -> PmacIO:
+    """
+    PMac controller using running fly scans with trajectory
+    """
+    motor = turbo_slit_x()
+    return PmacIO(
+        prefix=f"{PREFIX.beamline_prefix}-MO-STEP-06:",
+        raw_motors=[motor],
+        coord_nums=[3],
+    )
+
+
 @device_factory()
 def panda() -> HDFPanda:
     return HDFPanda(

dodal/beamlines/i21.py

@@ -1,15 +1,32 @@
+from pathlib import Path
+
+from daq_config_server.client import ConfigServer
+
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.i21 import Grating
-from dodal.devices.insertion_device.apple2_undulator import (
+from dodal.devices.i21 import (
+    Grating,
+)
+from dodal.devices.insertion_device import (
     Apple2,
+    Apple2EnforceLHMoveController,
+    BeamEnergy,
+    InsertionDeviceEnergy,
+    InsertionDevicePolarisation,
     UndulatorGap,
     UndulatorPhaseAxes,
 )
+from dodal.devices.insertion_device.energy_motor_lookup import (
+    ConfigServerEnergyMotorLookup,
+)
+from dodal.devices.insertion_device.lookup_table_models import LookupTableColumnConfig
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.temperture_controller import (
+    Lakeshore336,
+)
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -18,6 +35,14 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+I21_PHASE_POLY_DEG_COLUMNS = ["b"]
+I21_GRATING_COLUMNS = "Grating"
+
+I21_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
+LOOK_UPTABLE_DIR = "/dls_sw/i21/software/gda/workspace_git/gda-diamond.git/configurations/i21-config/lookupTables/"
+GAP_LOOKUP_FILE_NAME = "IDEnergy2GapCalibrations.csv"
+PHASE_LOOKUP_FILE_NAME = "IDEnergy2PhaseCalibrations.csv"
+
 
 @device_factory()
 def synchrotron() -> Synchrotron:
@@ -49,9 +74,51 @@ def id_phase() -> UndulatorPhaseAxes:
 
 
 @device_factory()
-def id() -> Apple2:
+def id() -> Apple2[UndulatorPhaseAxes]:
     """I21 insertion device."""
-    return Apple2(
+    return Apple2[UndulatorPhaseAxes](
         id_gap=id_gap(),
         id_phase=id_phase(),
     )
+
+
+@device_factory()
+def id_controller() -> Apple2EnforceLHMoveController[UndulatorPhaseAxes]:
+    """i21 insertion device controller."""
+    return Apple2EnforceLHMoveController[UndulatorPhaseAxes](
+        apple2=id(),
+        gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(grating=I21_GRATING_COLUMNS),
+            config_client=I21_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        phase_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(
+                grating=I21_GRATING_COLUMNS, poly_deg=I21_PHASE_POLY_DEG_COLUMNS
+            ),
+            config_client=I21_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        units="eV",
+    )
+
+
+@device_factory()
+def id_energy() -> InsertionDeviceEnergy:
+    return InsertionDeviceEnergy(id_controller=id_controller())
+
+
+@device_factory()
+def id_polarisation() -> InsertionDevicePolarisation:
+    return InsertionDevicePolarisation(id_controller=id_controller())
+
+
+@device_factory()
+def energy_jid() -> BeamEnergy:
+    """Beam energy."""
+    return BeamEnergy(id_energy=id_energy(), mono=pgm().energy)
+
+
+@device_factory()
+def sample_temperature_controller() -> Lakeshore336:
+    return Lakeshore336(prefix=f"{PREFIX.beamline_prefix}-EA-TCTRL-01:")

dodal/beamlines/i23.py

@@ -1,16 +1,13 @@
+from functools import cache
 from pathlib import Path
 
-from ophyd_async.core import InOut, StrictEnum
+from ophyd_async.core import InOut, PathProvider, StrictEnum
 from ophyd_async.epics.adpilatus import PilatusDetector
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    get_path_provider,
-    set_path_provider,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.device_manager import DeviceManager
 from dodal.devices.motors import SixAxisGonio
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.positioner import Positioner1D
@@ -25,18 +22,22 @@ from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, get_hostname
 
 BL = get_beamline_name("i23")
+PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(
-    StaticVisitPathProvider(
+devices = DeviceManager()
+
+
+@devices.fixture
+@cache
+def path_provider() -> PathProvider:
+    return StaticVisitPathProvider(
         BL,
         Path("/tmp"),
         client=LocalDirectoryServiceClient(),
     )
-)
 
-PREFIX = BeamlinePrefix(BL)
 
 I23_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=4),
@@ -59,51 +60,44 @@ def _is_i23_machine():
     return hostname.startswith("i23-ws") or hostname.startswith("i23-control")
 
 
-@device_factory(skip=lambda: not _is_i23_machine())
+@devices.factory(skip=lambda: not _is_i23_machine())
 def oav_pin_tip_detection() -> PinTipDetection:
-    """Get the i23 OAV pin-tip detection device."""
-
     return PinTipDetection(
         f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         "pin_tip_detection",
     )
 
 
-@device_factory()
+@devices.factory()
 def shutter() -> ZebraShutter:
-    """Get the i23 zebra controlled shutter."""
     return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def gonio() -> SixAxisGonio:
-    """Get the i23 goniometer"""
     return SixAxisGonio(f"{PREFIX.beamline_prefix}-MO-GONIO-01:")
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i23 zebra"""
     return Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:ZEBRA:",
         mapping=I23_ZEBRA_MAPPING,
     )
 
 
-@device_factory()
-def pilatus() -> PilatusDetector:
-    """Get the i23 pilatus"""
+@devices.factory()
+def pilatus(path_provider: PathProvider) -> PilatusDetector:
     return PilatusDetector(
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
-        path_provider=get_path_provider(),
+        path_provider=path_provider,
         drv_suffix="cam1:",
         fileio_suffix=HDF5_SUFFIX,
     )
 
 
-@device_factory()
+@devices.factory()
 def detector_motion() -> Positioner1D[I23DetectorPositions]:
-    """Get the i23 detector"""
     return Positioner1D[I23DetectorPositions](
         f"{PREFIX.beamline_prefix}-EA-DET-01:Z",
         datatype=I23DetectorPositions,

dodal/beamlines/i24.py

@@ -1,12 +1,12 @@
-from pathlib import PurePath
+from functools import cache
+from pathlib import Path
 
-from ophyd_async.core import AutoIncrementingPathProvider, StaticFilenameProvider
+from ophyd_async.core import AutoMaxIncrementingPathProvider, PathProvider
 
-from dodal.common.beamlines.beamline_utils import (
-    BL,
-    device_factory,
-)
+from dodal.common.beamlines.beamline_utils import BL
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.device_manager import DeviceManager
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
 from dodal.devices.attenuator.filter_selections import (
     I24FilterOneSelections,
@@ -25,12 +25,14 @@ from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.motors import YZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
+from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
     ZebraMapping,
     ZebraSources,
     ZebraTTLOutputs,
 )
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -45,111 +47,67 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 
 I24_ZEBRA_MAPPING = ZebraMapping(
-    outputs=ZebraTTLOutputs(TTL_EIGER=1, TTL_PILATUS=2, TTL_FAST_SHUTTER=4),
+    outputs=ZebraTTLOutputs(TTL_EIGER=1, TTL_JUNGFRAU=2, TTL_FAST_SHUTTER=4),
     sources=ZebraSources(),
 )
 
 PREFIX = BeamlinePrefix(BL)
 
+devices = DeviceManager()
+
+
+@devices.fixture
+@cache
+def path_provider() -> PathProvider:
+    return StaticVisitPathProvider(
+        BL,
+        Path("/tmp"),
+        client=LocalDirectoryServiceClient(),
+    )
+
 
-@device_factory()
+@devices.factory()
 def attenuator() -> EnumFilterAttenuator:
-    """Get a read-only attenuator device for i24, instantiate it if it hasn't already
-    been. If this is called when already instantiated in i24, it will return the
-    existing object."""
     return EnumFilterAttenuator(
         f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
         filter_selection=(I24FilterOneSelections, I24FilterTwoSelections),
     )
 
 
-@device_factory()
+@devices.factory()
 def aperture() -> Aperture:
-    """Get the i24 aperture device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
-    return Aperture(
-        f"{PREFIX.beamline_prefix}-AL-APTR-01:",
-    )
+    return Aperture(f"{PREFIX.beamline_prefix}-AL-APTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def beamstop() -> Beamstop:
-    """Get the i24 beamstop device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
-    return Beamstop(
-        f"{PREFIX.beamline_prefix}-MO-BS-01:",
-    )
+    return Beamstop(f"{PREFIX.beamline_prefix}-MO-BS-01:")
 
 
-@device_factory()
+@devices.factory()
 def backlight() -> DualBacklight:
-    """Get the i24 backlight device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
-    return DualBacklight(
-        prefix=PREFIX.beamline_prefix,
-    )
+    return DualBacklight(prefix=PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 def detector_motion() -> YZStage:
-    """Get the i24 detector motion device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
-    return YZStage(
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:",
-    )
+    return YZStage(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:")
 
 
-@device_factory()
+@devices.factory()
 def dcm() -> DCM:
-    """Get the i24 DCM device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
     return DCM(
         prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
         motion_prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
     )
 
 
-# TODO implement ophyd-async eiger see
-# https://github.com/DiamondLightSource/mx-bluesky/issues/62
-# @skip_device(lambda: BL == "s24")
-# def eiger(
-#     wait_for_connection: bool = True,
-#     fake_with_ophyd_sim: bool = False,
-#     params: DetectorParams | None = None,
-# ) -> EigerDetector:
-#     """Get the i24 Eiger device, instantiate it if it hasn't already been.
-#     If this is called when already instantiated, it will return the existing object.
-#     If called with params, will update those params to the Eiger object.
-#     """
-#
-#     def set_params(eiger: EigerDetector):
-#         if params is not None:
-#             eiger.set_detector_parameters(params)
-#
-#     return device_instantiation(
-#         device_factory=EigerDetector,
-#         name="eiger",
-#         prefix="-EA-EIGER-01:",
-#         wait=wait_for_connection,
-#         fake=fake_with_ophyd_sim,
-#         post_create=set_params,
-#     )
-
-
-@device_factory()
+@devices.factory()
 def pmac() -> PMAC:
-    """Get the i24 PMAC device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
     return PMAC(PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 def oav() -> OAVBeamCentreFile:
     return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
@@ -157,62 +115,54 @@ def oav() -> OAVBeamCentreFile:
     )
 
 
-@device_factory()
+@devices.factory()
 def vgonio() -> VerticalGoniometer:
-    """Get the i24 vertical goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object.
-    """
     return VerticalGoniometer(f"{PREFIX.beamline_prefix}-MO-VGON-01:")
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i24 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i24, it will return the existing object.
-    """
     return Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
         mapping=I24_ZEBRA_MAPPING,
     )
 
 
-@device_factory()
+@devices.factory()
 def shutter() -> HutchShutter:
-    """Get the i24 hutch shutter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object.
-    """
     return HutchShutter(f"{PREFIX.beamline_prefix}-PS-SHTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def focus_mirrors() -> FocusMirrorsMode:
-    """Get the i24 focus mirror devise to find the beam size."""
     return FocusMirrorsMode(f"{PREFIX.beamline_prefix}-OP-MFM-01:")
 
 
-@device_factory()
+@devices.factory()
 def eiger_beam_center() -> DetectorBeamCenter:
-    """A device for setting/reading the beamcenter from the eiger on i24."""
-    return DetectorBeamCenter(
-        f"{PREFIX.beamline_prefix}-EA-EIGER-01:CAM:",
-        "eiger_bc",
-    )
+    return DetectorBeamCenter(f"{PREFIX.beamline_prefix}-EA-EIGER-01:CAM:", "eiger_bc")
 
 
-@device_factory()
+@devices.factory()
 def commissioning_jungfrau(
-    path_to_dir: str = "/tmp/jf",  # Device factory doesn't allow for required args,
-    filename: str = "jf_output",  # but these should be manually entered when commissioning
+    path_provider: PathProvider,
 ) -> CommissioningJungfrau:
     """Get the commissionning Jungfrau 9M device, which uses a temporary filewriter
-    device in place of Odin while the detector is in commissioning.
-    Instantiates the device if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object."""
-
+    device in place of Odin while the detector is in commissioning."""
     return CommissioningJungfrau(
         f"{PREFIX.beamline_prefix}-EA-JFRAU-01:",
         f"{PREFIX.beamline_prefix}-JUNGFRAU-META:FD:",
-        AutoIncrementingPathProvider(
-            StaticFilenameProvider(filename), PurePath(path_to_dir)
-        ),
+        AutoMaxIncrementingPathProvider(path_provider),
+    )
+
+
+@devices.factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@devices.factory()
+def sample_shutter() -> ZebraShutter:
+    return ZebraShutter(
+        f"{PREFIX.beamline_prefix}-EA-SHTR-01:",
     )

dodal/beamlines/p60.py

@@ -2,7 +2,7 @@ from dodal.common.beamlines.beamline_utils import (
     device_factory,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.electron_analyser import DualEnergySource
+from dodal.devices.electron_analyser.base import DualEnergySource
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from dodal.devices.p60 import (
     LabXraySource,
@@ -11,6 +11,7 @@ from dodal.devices.p60 import (
     PassEnergy,
     PsuMode,
 )
+from dodal.devices.selectable_source import SourceSelector
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -20,6 +21,11 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 
 
+@device_factory()
+def source_selector() -> SourceSelector:
+    return SourceSelector()
+
+
 @device_factory()
 def al_kalpha_source() -> LabXraySourceReadable:
     return LabXraySourceReadable(LabXraySource.AL_KALPHA)
@@ -32,7 +38,11 @@ def mg_kalpha_source() -> LabXraySourceReadable:
 
 @device_factory()
 def energy_source() -> DualEnergySource:
-    return DualEnergySource(al_kalpha_source().energy_ev, mg_kalpha_source().energy_ev)
+    return DualEnergySource(
+        al_kalpha_source().energy_ev,
+        mg_kalpha_source().energy_ev,
+        source_selector().selected_source,
+    )
 
 
 # Connect will work again after this work completed

dodal/common/__init__.py

@@ -1,6 +1,6 @@
 from .coordination import group_uuid, inject
 from .enums import EnabledDisabledUpper, InOutUpper, OnOffUpper
-from .maths import in_micros, step_to_num
+from .maths import Rectangle2D, in_micros, step_to_num
 from .types import MsgGenerator, PlanGenerator
 
 __all__ = [
@@ -13,4 +13,5 @@ __all__ = [
     "MsgGenerator",
     "PlanGenerator",
     "step_to_num",
+    "Rectangle2D",
 ]