Skip to content

Commit

Permalink
Updated TriggerInfo parameters to match ophyd-async==0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
canismarko committed Oct 25, 2024
1 parent 90c7837 commit 36afaa0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers = [
"Topic :: System :: Hardware",
]
keywords = ["synchrotron", "xray", "bluesky"]
dependencies = ["aioca", "bluesky", "ophyd", "ophyd-async>=0.5.1", "databroker", "apsbss", "xraydb",
dependencies = ["aioca", "bluesky", "ophyd", "ophyd-async>=0.7.0", "databroker", "apsbss", "xraydb",
"mergedeep", "xrayutilities", "bluesky-queueserver-api",
"apstools", "databroker", "ophyd-registry", "caproto", "pcdsdevices",
"strenum", "bluesky-adaptive", "tiled[client]"]
Expand Down
2 changes: 1 addition & 1 deletion src/haven/plans/fly.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def fly_line_scan(detectors: list, *args, num, dwell_time):
yield from bps.prepare(obj, position_info, wait=False, group=prepare_group)
# Set up detectors
trigger_info = TriggerInfo(
number=num, livetime=dwell_time, deadtime=0, trigger="internal"
number_of_triggers=num, livetime=dwell_time, deadtime=0, trigger="internal"
)
for obj in detectors:
yield from bps.prepare(obj, trigger_info, wait=False, group=prepare_group)
Expand Down
2 changes: 1 addition & 1 deletion src/haven/tests/test_ion_chamber.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def test_offset_pv(sim_registry):

@pytest.fixture()
def trigger_info():
return TriggerInfo(number=5, trigger="internal", deadtime=0, livetime=1.3)
return TriggerInfo(number_of_triggers=5, trigger="internal", deadtime=0, livetime=1.3)


async def test_flyscan_prepare(ion_chamber, trigger_info):
Expand Down

0 comments on commit 36afaa0

Please sign in to comment.