[pilx] use dynamic masking for diffraction images #2450
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
kif
added
gui
loichuder
approved these changes
Feb 20, 2025
src/pyFAI/gui/pilx/MainWindow.py
Outdated
Comment on lines
282
to
303
| if maskfile: | ||
| mask_image = get_data(url=DataUrl(maskfile)) | ||
| if mask_image.shape != image.shape: | ||
| mask_image = None | ||
| binning = [m//i for i, m in zip(image.shape, mask_image.shape)] | ||
| if min(binning)<1: | ||
| mask_image = None | ||
| else: | ||
| mask_image = rebin_fct(mask_image, binning) | ||
| else: | ||
| mask_image = None | ||
|
|
||
| detector = self.worker_config.poni.detector | ||
| if detector: | ||
| detector_mask = detector.mask | ||
| if detector.shape != image.shape: | ||
| detector.guess_binning(image) | ||
| detector_mask = rebin_fct(detector_mask, detector.binning) | ||
| if mask_image is None: | ||
| mask_image = detector_mask | ||
| else: | ||
| numpy.logical_or(mask_image, detector_mask, out=mask_image) | ||
| detector.mask = mask_image | ||
| mask_image = detector.dynamic_mask(image) |
There was a problem hiding this comment.
All these intertwined conditions make the code difficult to parse. I would suggest to move the highlighted part in a separate function (like get_mask_file) and use early returns. That will perhaps help a bit.
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 allows to hide the intense gaps in Eiger images thus better auto- color scale.
close #2432