Skip to content

Commit

Permalink
Switch from intelligent save to intelligent load (#697)
Browse files Browse the repository at this point in the history
Use the concept of Settings that can be:
- Created from a Device
- Stored to YAML
- Retrieved from YAML
- Added to other Settings
- Applied to a Device
  • Loading branch information
coretl authored Dec 11, 2024
1 parent e08148f commit e27b6d7
Show file tree
Hide file tree
Showing 22 changed files with 750 additions and 720 deletions.
27 changes: 9 additions & 18 deletions src/ophyd_async/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@
)
from ._device import Device, DeviceCollector, DeviceConnector, DeviceVector
from ._device_filler import DeviceFiller
from ._device_save_loader import (
all_at_once,
get_signal_values,
load_device,
load_from_yaml,
save_device,
save_to_yaml,
set_signal_values,
walk_rw_signals,
)
from ._flyer import FlyerController, StandardFlyer
from ._hdf_dataset import HDFDataset, HDFFile
from ._log import config_ophyd_async_logging
Expand All @@ -41,6 +31,7 @@
StandardReadable,
StandardReadableFormat,
)
from ._settings import Settings, SettingsProvider
from ._signal import (
Signal,
SignalConnector,
Expand All @@ -55,9 +46,11 @@
soft_signal_r_and_setter,
soft_signal_rw,
wait_for_value,
walk_rw_signals,
)
from ._signal_backend import (
Array1D,
DTypeScalar_co,
SignalBackend,
SignalDatatype,
SignalDatatypeT,
Expand All @@ -84,6 +77,7 @@
in_micros,
wait_for_connection,
)
from ._yaml_settings import YamlSettingsProvider

__all__ = [
"DetectorController",
Expand All @@ -96,14 +90,6 @@
"DeviceCollector",
"DeviceVector",
"DeviceFiller",
"all_at_once",
"get_signal_values",
"load_device",
"load_from_yaml",
"save_device",
"save_to_yaml",
"set_signal_values",
"walk_rw_signals",
"StandardFlyer",
"FlyerController",
"HDFDataset",
Expand All @@ -128,6 +114,8 @@
"HintedSignal",
"StandardReadable",
"StandardReadableFormat",
"Settings",
"SettingsProvider",
"Signal",
"SignalConnector",
"SignalR",
Expand All @@ -141,7 +129,9 @@
"soft_signal_r_and_setter",
"soft_signal_rw",
"wait_for_value",
"walk_rw_signals",
"Array1D",
"DTypeScalar_co",
"SignalBackend",
"make_datakey",
"StrictEnum",
Expand All @@ -168,4 +158,5 @@
"in_micros",
"wait_for_connection",
"completed_status",
"YamlSettingsProvider",
]
274 changes: 0 additions & 274 deletions src/ophyd_async/core/_device_save_loader.py

This file was deleted.

Loading

0 comments on commit e27b6d7

Please sign in to comment.