Skip to content

Commit

Permalink
Merge pull request #264 from BCDA-APS/263-registry
Browse files Browse the repository at this point in the history
@canismarko Thanks!
  • Loading branch information
prjemian authored Feb 7, 2024
2 parents 2bc372d + 4690357 commit 5bc4008
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ describe future plans.
1.0.3
******
release expected by 2024-02-01
release expected by 2024-04-01

1.0.2
******

release expected by 2023-12-31
release expected by 2024-03-01

New Features
------------
Expand All @@ -38,6 +38,8 @@ New Features

* ophyd-registry

* Build ``registry`` of all ophyd objects.

Maintenance
------------

Expand Down
5 changes: 5 additions & 0 deletions bluesky/instrument/framework/initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
bp bps bpp
summarize_plan
np
registry
""".split()

import logging
Expand All @@ -31,6 +32,7 @@
from bluesky.utils import ts_msg_hook
from IPython import get_ipython
from ophyd.signal import EpicsSignalBase
from ophydregistry import Registry
import databroker
import ophyd
import warnings
Expand Down Expand Up @@ -117,6 +119,9 @@ def get_md_path():
connection_timeout=iconfig.get("PV_CONNECTION_TIMEOUT", TIMEOUT),
)

# Create a registry of ophyd devices
registry = Registry(auto_register=True)

_pv = iconfig.get("RUN_ENGINE_SCAN_ID_PV")
if _pv is None:
logger.info("Using RunEngine metadata for scan_id")
Expand Down

0 comments on commit 5bc4008

Please sign in to comment.