Combine raw & proc in open_run() by default #569
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
approved these changes
Nov 1, 2024
extra_data/reader.py
Outdated
| if origin not in absence_ok: | ||
| if base_dc is None: | ||
| raise | ||
| warn(f'No data available for this run at origin {origin}') | ||
| else: |
There was a problem hiding this comment.
I would probably go for a continue in the except branch, and move the entire else branch to after the complete try-except to avoid a level of indentation for so much code. I realize this has been like this before (written by me 🙃), but the logic seems complicated enough now that it seems useful.
|
This now also fixes a bug @JamesWrigley noticed, where specifying |
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.
This adds a new
data='default'option (which becomes the default) to combine raw & proc data, preferring raw where names clash. For new data, this means you can access corrected detector data with the new source names (e.g.*/CORR/*), alongside raw data with names like*/DET/*. For older data, there will be no difference fromdata='raw'.open_run()without passingdata=and then uses a detector component likeAGIPD1M()previously got raw data, but would now get corrected data when reading runs with the new source names. But hopefully this isn't common, and it's easily fixed.A large part of the diff is just moving some existing tests to a new file, so it may be easier to review by commit.