Add require_any keyword argument to source selection #400
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
philsmt
force-pushed
the
feat/select-require-any
branch
2 times, most recently
from
c9708e8
to
66a83f5
Compare
philsmt
commented
May 5, 2023
extra_data/reader.py
Outdated
| train_ids = self.train_ids | ||
| if require_all: | ||
| train_ids = self.train_ids | ||
| else: |
There was a problem hiding this comment.
Suggested change
| else: | |
| else: # require_any |
Comment on lines
614
to
615
| .deselect([('SA3_XTD10_MCP/ADC/1:*', '*'), | ||
| ('SA3_XTD10_IMGFEL/CAM/BEAMVIEW:*', '*')]) |
There was a problem hiding this comment.
These deselections aren't needed here.
|
Reviewed in person, LGTM |
philsmt
force-pushed
the
feat/select-require-any
branch
from
66a83f5
to
166610c
Compare
|
Thanks! Pushed one last typo change in a test comment 🙈 |
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.
Complementing the earlier support to match data during a selection, this PR adds a
require_anykeyword argument as a weaker version ofrequire_all. Rather than requiring all source to have data for each train, it only requires one source to have data for each train. The use cases for this are definitely smaller, but it seemed trivial to add to the existingrequire_allcode by tweaking the logic only slightly.Also used the opportunity to fix an oversight from #367 with
require_allnot actually being forwarded fromrun.alias.select()torun.select().An open question is whether this should be ported to
run.trains()as well.