Skip to content
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.

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

Adds a panda flyer that is implemented with a pcomp block #430

Merged

Conversation

evalott100
Copy link
Contributor

@evalott100 evalott100 commented Jul 3, 2024

Closes #375

@evalott100 evalott100 marked this pull request as draft July 3, 2024 12:42
@evalott100 evalott100 linked an issue Jul 3, 2024 that may be closed by this pull request
@evalott100 evalott100 force-pushed the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch from dd9dfca to b761049 Compare July 3, 2024 14:42
@evalott100 evalott100 marked this pull request as ready for review July 3, 2024 14:45
@evalott100
Copy link
Contributor Author

@coretl Should I wait for #376 to add a test with flying?

@coretl
Copy link
Collaborator

coretl commented Jul 3, 2024

@coretl Should I wait for #376 to add a test with flying?

I think you should be able to do the test and the plan stub without #376, maybe try it and see?

@evalott100
Copy link
Contributor Author

@coretl I've added a test that mirrors this:

async def test_trigger_logic_has_given_methods(panda):
trigger_logic = StaticSeqTableTriggerLogic(panda.seq[1])
assert hasattr(trigger_logic, "prepare")
assert hasattr(trigger_logic, "kickoff")
assert hasattr(trigger_logic, "complete")
assert hasattr(trigger_logic, "stop")

But I think we should probably remove them, I'm not sure what the purpose of this is (checking an object has the methods defined in the class).

@evalott100 evalott100 force-pushed the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch from 10d269c to 254fd6d Compare July 5, 2024 12:22
src/ophyd_async/panda/_trigger.py Outdated Show resolved Hide resolved
src/ophyd_async/panda/_trigger.py Outdated Show resolved Hide resolved
src/ophyd_async/panda/_trigger.py Outdated Show resolved Hide resolved
@coretl
Copy link
Collaborator

coretl commented Jul 5, 2024

@coretl I've added a test that mirrors this:

async def test_trigger_logic_has_given_methods(panda):
trigger_logic = StaticSeqTableTriggerLogic(panda.seq[1])
assert hasattr(trigger_logic, "prepare")
assert hasattr(trigger_logic, "kickoff")
assert hasattr(trigger_logic, "complete")
assert hasattr(trigger_logic, "stop")

But I think we should probably remove them, I'm not sure what the purpose of this is (checking an object has the methods defined in the class).

Not much point in tests like that

src/ophyd_async/panda/_trigger.py Outdated Show resolved Hide resolved
src/ophyd_async/plan_stubs/fly.py Outdated Show resolved Hide resolved
@evalott100 evalott100 force-pushed the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch 3 times, most recently from b9b7a5d to d8a2df8 Compare July 8, 2024 11:06
src/ophyd_async/core/detector.py Outdated Show resolved Hide resolved
src/ophyd_async/core/detector.py Show resolved Hide resolved
src/ophyd_async/panda/_common_blocks.py Outdated Show resolved Hide resolved
src/ophyd_async/panda/_table.py Show resolved Hide resolved
src/ophyd_async/panda/_trigger.py Show resolved Hide resolved
src/ophyd_async/panda/_trigger.py Outdated Show resolved Hide resolved
src/ophyd_async/plan_stubs/fly.py Outdated Show resolved Hide resolved
@evalott100 evalott100 force-pushed the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch from f93944a to 11f94b8 Compare July 9, 2024 14:50
@evalott100 evalott100 requested a review from coretl July 9, 2024 14:50
@evalott100 evalott100 force-pushed the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch from b15923d to 1fdfd17 Compare July 10, 2024 08:34
@coretl coretl merged commit bd6085b into main Jul 10, 2024
18 checks passed
@coretl coretl deleted the 375-make-a-panda-flyer-that-is-implemented-with-a-pcomp-block branch July 10, 2024 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move Flyable dataclasses to pydantic dataclasses Make a PandA flyer that is implemented with a PCOMP block
3 participants