Fix masking in DayNightCompositor when composites have partial missing data #447
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
Codecov Report
@@ Coverage Diff @@
## master #447 +/- ##
==========================================
- Coverage 73.07% 72.86% -0.22%
==========================================
Files 134 134
Lines 17662 17871 +209
==========================================
+ Hits 12907 13022 +115
- Misses 4755 4849 +94
Continue to review full report at Codecov.
|
djhoese
reviewed
Oct 9, 2018
satpy/composites/__init__.py
Outdated
| nans = xu.logical_and(xu.isnan(data1), | ||
| xu.logical_not(xu.isnan(data2))) | ||
| attrs = data1.attrs.copy() | ||
| data1 = xr.where(nans, 0, data1) |
There was a problem hiding this comment.
Does using data1.where(~nans, 0) preserve the attributes?
djhoese
reviewed
Oct 9, 2018
satpy/composites/__init__.py
Outdated
| xu.logical_not(xu.isnan(data2))) | ||
| attrs = data1.attrs.copy() | ||
| data1 = xr.where(nans, 0, data1) | ||
| data1.attrs = attrs.copy() |
There was a problem hiding this comment.
You are copying the attributes dictionary twice.
|
Indeed, that |
|
Don't have time for adding unit tests during this week, and next week I'm out of office. |
djhoese
approved these changes
Oct 11, 2018
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.
If one of the two composites passed to
DayNightCompositorhas partially missing data the resulting merged composite had holes at those locations. This discrepancy between the composites can be e.g. due to reflectances below zero on the night side being masked out by the reader. This behavior can be correct for other use cases, but here it creates distracting holes in the images.This PR replaces the masked ares with zeros if they are valid in the other composite.
git diff origin/master **/*py | flake8 --diff