Added Sequencer trigger logic from ScanSpec #565
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
coretl
requested changes
Sep 10, 2024
| @@ -61,6 +61,7 @@ dev = [ | |||
| "pytest-rerunfailures", | |||
| "pytest-timeout", | |||
| "ruff", | |||
| "scanspec==0.7.2", | |||
There was a problem hiding this comment.
Suggested change
| "scanspec==0.7.2", | |
| "scanspec>=0.7.2", |
Comment on lines
82
to
83
| if type(rows[0]) is tuple: | ||
| rows = rows[0] |
There was a problem hiding this comment.
I had been meaning to ask you about this. I found some odd behaviour with the seq_table_from_rows() method - perhaps I'm not quite using it right.
seq_table_from_rows(SeqTableRow(), SeqTableRow())
The above works as expected but the below raises an error:
rows = (SeqTableRow(), SeqTableRow())
seq_table_from_rows(rows)
AttributeError: 'tuple' object has no attribute 'repeats'
When I looked into it I found that inside the method, rows gets turned into ((SeqTableRow(), SeqTableRow()),) - A tuple within a tuple. So my workaround was to check if the first element in rows was a tuple, and to use that instead.
| WatchableAsyncStatus, | ||
| wait_for_value, | ||
| ) | ||
| from ophyd_async.epics import motor |
There was a problem hiding this comment.
We shouldn't import epics from fastcs. Can we use INENC1.VAL.Scale from PandA instead?
tomtrafford
force-pushed
the
scanspec-seq-trigger
branch
from
c1f9653 to
7d4244e
Compare
tomtrafford
force-pushed
the
scanspec-seq-trigger
branch
from
7d4244e to
9f5813d
Compare
tomtrafford
force-pushed
the
scanspec-seq-trigger
branch
from
bbdfd4a to
f5f183b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes implements a Panda Trigger Logic Flyer, setting up a PandA Seq table and resolves #448. On Prepare it takes a Spec[motor.Motor], which would describe the trajectory of the scan, and uses this to calculate the gaps in the scan. Between each gap it will setup a new set of rows in the sequencer table.