Refactor to handle wavelength bands during normalization step #68
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
nvaytet
approved these changes
Feb 5, 2024
src/esssans/i_of_q.py
Outdated
| out = sc.concat(sections, band_dim) | ||
| out.coords[dim] = wavelength_bands | ||
| return out | ||
| q_all_pixels = data_q.bins.concat(dims_to_reduce) |
There was a problem hiding this comment.
Now that the body of this function is so small, and the one for the dense merging is also much reduced, would it make more sense to just inline the code in merge_spectra?
I don't mind, it's a matter of taste. It may still be more readable as it is now.
src/esssans/i_of_q.py
Outdated
| del stripped.coords[name] | ||
| to_flatten = [dim for dim in data_q.dims if dim in dims_to_reduce] | ||
|
|
||
| dummy_dim = str(uuid4()) | ||
| # Make sure that dims to flatten are contiguous, and that Q is the last dim | ||
| # Make dims to flatten contiguous, keep wavelength is the last dim |
There was a problem hiding this comment.
Suggested change
| # Make dims to flatten contiguous, keep wavelength is the last dim | |
| # Make dims to flatten contiguous, keep wavelength as the last dim |
nvaytet
approved these changes
Feb 6, 2024
Merged
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.
Aside from simplifying code, this has the advantage of offering more flexibility. For example, it will allow for running the direct-beam iteration in the pre-computed
CleanSummedQ, with minimal cost per iteration, i.e., an overall speedup.This would also allow for pre-computing a modified denominator term containing no monitors. Monitors could then be factor in in the final step. This would also reduce the impact of variances of monitor broadcasting, since a broadcast to all pixel is avoided (only broadcast to all Q). We can explore this in a follow-up.