Skip to content

Commit 4e67402

Browse files
committed
Changed to trigger on lower position, rather than midpoint
1 parent 16f752f commit 4e67402

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/ophyd_async/fastcs/panda/_trigger.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def __init__(self, seq: SeqBlock, name="") -> None:
6666
self.name = name
6767

6868
async def prepare(self, value: ScanSpecInfo):
69-
await self.seq.enable.set(BitMux.zero)
69+
await self.seq.enable.set(PandaBitMux.ZERO)
7070
path = Path(value.spec.calculate())
7171
chunk = path.consume()
7272
gaps = self._calculate_gaps(chunk)
@@ -98,7 +98,7 @@ async def prepare(self, value: ScanSpecInfo):
9898
rows += SeqTable.row(
9999
trigger=trig,
100100
position=int(
101-
chunk.midpoints[fast_axis][start]
101+
chunk.lower[fast_axis][start]
102102
/ await fast_axis.encoder_res.get_value()
103103
),
104104
)
@@ -121,20 +121,20 @@ async def prepare(self, value: ScanSpecInfo):
121121
start = gap
122122
await asyncio.gather(
123123
self.seq.prescale.set(1.0),
124-
self.seq.prescale_units.set(TimeUnits.us),
124+
self.seq.prescale_units.set(PandaTimeUnits.US),
125125
self.seq.repeats.set(1),
126126
self.seq.table.set(rows),
127127
)
128128

129129
async def kickoff(self) -> None:
130-
await self.seq.enable.set(BitMux.one)
130+
await self.seq.enable.set(PandaBitMux.ONE)
131131
await wait_for_value(self.seq.active, True, timeout=1)
132132

133133
async def complete(self) -> None:
134134
await wait_for_value(self.seq.active, False, timeout=None)
135135

136136
async def stop(self):
137-
await self.seq.enable.set(BitMux.zero)
137+
await self.seq.enable.set(PandaBitMux.ZERO)
138138
await wait_for_value(self.seq.active, False, timeout=1)
139139

140140
def _calculate_gaps(self, chunk: Frames[motor.Motor]):

tests/fastcs/panda/test_trigger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ async def test_seq_scanspec_trigger_logic(mock_panda, sim_x_motor, sim_y_motor)
116116
SeqTrigger.IMMEDIATE,
117117
SeqTrigger.BITA_0,
118118
]
119-
assert (out.position == [0, 0, 50, 0, 0, 0, 250, 0, 0, 0, 50, 0, 0]).all()
119+
assert (out.position == [0, 0, 25, 0, 0, 0, 275, 0, 0, 0, 25, 0, 0]).all()
120120
assert (out.time1 == [0, 0, 0, 900000, 0, 0, 0, 900000, 0, 0, 0, 900000, 0]).all()
121121
assert (out.time2 == [0, 0, 0, 100000, 0, 0, 0, 100000, 0, 0, 0, 100000, 0]).all()
122122

0 commit comments

Comments
 (0)