added number_of_frames instead of iterations #581
Merged
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
ZohebShaikh
force-pushed
the
575-more-flexible-multi-run-specification
branch
from
d86e04c
to
c52e34b
Compare
ZohebShaikh
force-pushed
the
575-more-flexible-multi-run-specification
branch
from
e7c72ba
to
31c7ded
Compare
coretl
reviewed
Sep 19, 2024
ZohebShaikh
commented
Sep 26, 2024
| ] | ||
|
|
||
|
|
||
| async def test_hdf_panda_hardware_triggered_flyable_with_iterations( |
There was a problem hiding this comment.
I have deleted test_hdf_panda_hardware_triggered_flyable_with_iterations and moved it to
@pytest.mark.parametrize("number_of_frames", [[1, 1, 1, 1], [2, 3, 100, 3]])
async def test_hardware_triggered_flyable(
As we are removing iterations
evalott100
requested changes
Sep 26, 2024
evalott100
requested changes
Sep 26, 2024
evalott100
requested changes
Sep 26, 2024
ZohebShaikh
force-pushed
the
575-more-flexible-multi-run-specification
branch
from
fb3343e
to
3a56af0
Compare
evalott100
approved these changes
Sep 30, 2024
There was a problem hiding this comment.
I'm happy with this, I think we should wait for a once over from @coretl before we merge.
evalott100
requested changes
Sep 30, 2024
There was a problem hiding this comment.
I've changed my mind, I'd quite like
Which means either:
1)
adding
self._frames_completed += 1to complete and removing
self._frames_completed += self._frames_to_completefrom kickoff.
Or (and I actually think the following is the nicer option)
2)
Changing its name to self._completable_frames and leaving a comment in init that it represents the total number of frames that will have been completed at the end of the next complete.
This is nicer because it means that
if self._completable_frames >= self._trigger_info.total_number_of_triggers:
raise RuntimeError(will still work - if we changed to increment by 1 then would probably still need this variable to make sure you can't kickoff too many times.
…etable frames This commit refactors the kickoff method in the StandardDetector class to track the number of frames that can be completed after kickoff. The frames_completed attribute has been replaced with the completable_frames attribute, which represents the number of frames that can be completed. Additionally, the frames_completed attribute has been removed from the complete method and replaced with the completable_frames attribute. This change ensures that the completable_frames attribute is reset to 0 once the target number of iterations is reached and the detector is disarmed.
…stead of number_of_frames
…d invoke_extra_kickoff_before_complete
evalott100
requested changes
Oct 1, 2024
evalott100
approved these changes
Oct 2, 2024
There was a problem hiding this comment.
Fab, thank you 🙏
We should wait for a once over from @coretl
coretl
approved these changes
Oct 3, 2024
tomtrafford
pushed a commit
that referenced
this pull request
Oct 8, 2024
* Added more flexible multi-run specs * Refactor StandardDetector kickoff method to track the number of completable frames This commit refactors the kickoff method in the StandardDetector class to track the number of frames that can be completed after kickoff. The frames_completed attribute has been replaced with the completable_frames attribute, which represents the number of frames that can be completed. Additionally, the frames_completed attribute has been removed from the complete method and replaced with the completable_frames attribute. This change ensures that the completable_frames attribute is reset to 0 once the target number of iterations is reached and the detector is disarmed. * Refactor test_hardware_triggered_flyable to use number_of_triggers instead of number_of_frames * Refactor test_hardware_triggered_flyable to use number_of_triggers and invoke_extra_kickoff_before_complete * Refactor kickoff method to track total number of frames completed
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.
closes #575
This pull request introduces significant changes to the
TriggerInfoclass and related logic in theophyd_asyncpackage to support multiple trigger counts. The main changes include renaming thenumberfield tonumber_of_triggers, updating associated logic, and modifying tests to accommodate these changes.Core changes:
TriggerInfo Class:
numbertonumber_of_triggersand updated its type to support both single integers and lists of integers. (src/ophyd_async/core/_detector.py)computed_fieldandcached_propertyto calculate the total number of triggers. (src/ophyd_async/core/_detector.py)Detector Logic:
prepare,kickoff, andcompletemethods to handle the newnumber_of_triggerslogic. (src/ophyd_async/core/_detector.py)Controller updates:
preparemethods to usetotal_number_of_triggersinstead ofnumber. (src/ophyd_async/epics/adaravis/_aravis_controller.py,src/ophyd_async/epics/adkinetix/_kinetix_controller.py,src/ophyd_async/epics/adpilatus/_pilatus_controller.py,src/ophyd_async/epics/adsimdetector/_sim_controller.py,src/ophyd_async/epics/advimba/_vimba_controller.py,src/ophyd_async/epics/eiger/_eiger_controller.py)Test updates:
number_of_triggersfield. (tests/core/test_flyer.py,tests/conftest.py,system_tests/epics/eiger/test_eiger_system.py)Other changes:
cached_propertyand updated imports forNonNegativeIntandcomputed_field. (src/ophyd_async/core/_detector.py)iterationparameter fromprepare_static_seq_table_flyer_and_detectors_with_same_trigger. (src/ophyd_async/plan_stubs/_fly.py)