Skip to content

Commit

Permalink
Changed to trigger on lower position, rather than midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
tomtrafford committed Nov 28, 2024
1 parent e9387b5 commit f5f183b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/ophyd_async/fastcs/panda/_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ async def prepare(self, value: ScanSpecInfo):
rows += SeqTable.row(
trigger=trig,
position=int(
chunk.midpoints[fast_axis][start]
chunk.lower[fast_axis][start]
/ await fast_axis.encoder_res.get_value()
),
)
Expand Down
2 changes: 1 addition & 1 deletion tests/fastcs/panda/test_trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ async def test_seq_scanspec_trigger_logic(mock_panda, sim_x_motor, sim_y_motor)
SeqTrigger.IMMEDIATE,
SeqTrigger.BITA_0,
]
assert (out.position == [0, 0, 50, 0, 0, 0, 250, 0, 0, 0, 50, 0, 0]).all()
assert (out.position == [0, 0, 25, 0, 0, 0, 275, 0, 0, 0, 25, 0, 0]).all()
assert (out.time1 == [0, 0, 0, 900000, 0, 0, 0, 900000, 0, 0, 0, 900000, 0]).all()
assert (out.time2 == [0, 0, 0, 100000, 0, 0, 0, 100000, 0, 0, 0, 100000, 0]).all()

Expand Down

0 comments on commit f5f183b

Please sign in to comment.