Skip to content

set periods in adaptive_scan based on NUMPERIODS:MAX #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 5, 2025
Merged

set periods in adaptive_scan based on NUMPERIODS:MAX #170

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59ad8a1
set periods in adaptive_scan based on NUMPERIODS:MAX
rerpha Mar 31, 2025
a29f17b
Merge branch 'main' into set_max_periods
rerpha Mar 31, 2025
860ba97
use rd not read
rerpha Mar 31, 2025
180ce52
Merge branch 'set_max_periods' of https://github.com/IsisComputingGro…
rerpha Mar 31, 2025
a324ce0
Merge branch 'main' into set_max_periods
rerpha Apr 2, 2025
19c2e2c
Merge remote-tracking branch 'origin/main' into set_max_periods
rerpha Apr 14, 2025
ae0613f
unit test
rerpha Apr 14, 2025
7d40664
Merge branch 'main' into set_max_periods
rerpha Apr 28, 2025
e1bf92f
Merge branch 'main' into set_max_periods
rerpha May 7, 2025
4cc2ca8
Merge remote-tracking branch 'origin/main' into set_max_periods
rerpha Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ibex_bluesky_core/devices/dae/dae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def __init__(self, prefix: str, name: str = "DAE") -> None:
self.number_of_periods: DaeCheckingSignal[int] = DaeCheckingSignal(
int, f"{dae_prefix}NUMPERIODS"
)
self.max_periods: SignalR[int] = epics_signal_r(int, f"{dae_prefix}NUMPERIODS:MAX")

self.dae_settings = DaeSettings(dae_prefix)
self.period_settings = DaePeriodSettings(dae_prefix)
Expand Down
5 changes: 3 additions & 2 deletions src/ibex_bluesky_core/plans/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ def adaptive_scan( # noqa: PLR0913, PLR0917

"""
yield from ensure_connected(dae, block) # type: ignore

yield from bps.mv(dae.number_of_periods, 100)
if periods:
max_periods = yield from bps.rd(dae.max_periods)
yield from bps.mv(dae.number_of_periods, max_periods)

icc = _set_up_fields_and_icc(block, dae, model, periods, save_run)

Expand Down