Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3a3b transition in the aapp l1b reader #805

Merged
merged 5 commits into from Jun 10, 2019

Conversation

adybbroe
Copy link
Contributor

@adybbroe adybbroe commented Jun 5, 2019

Until now we only checked if channel 3b was set or not. We did not check if there was a transition (where there is apparently uncertainty which channel is active or both are not okay or set...)

This PR fixes this so we check explicitly for 3a and 3b. This means data where none are set is left out.

  • Closes #xxxx
  • Tests added and test suite added to parent suite
  • Tests passed
  • Passes flake8 satpy
  • Fully documented
  • Add your name to AUTHORS.md if not there already

self._is3b = np.repeat(is3b,
self._data['hrpt'][0].shape[0], axis=1)
is3a = np.expand_dims(np.bitwise_and(self._data['scnlinbit'], 3) == 0, 1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice that these operations don't seem to be dask at all. As such, could we only do this bitwise_and once? Right now, it is used for both 3b and 3a checks. Or, even better, convert this reader to use dask better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we discussed that here. @mraspaud indicated that this could need a daskification overhaul. I just wanted to make sure we get this improvement in now. The Dask could come in the next step. Also, there is no test for this reader it seems, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. It seems there are no tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will see what I might have/take time to fix. Both concerning Dask and tests. But, feel under pressure fixing our transition to our Satpy based production, and this is a minor thing in this regard...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so I will merge this now, given the time constraints we have on this being fixed and the time it would take to overhaul this (tests and dask-friendliness) and we open an issue to remind us on what needs to be done.

@adybbroe adybbroe added bug component:readers enhancement code enhancements, features, improvements labels Jun 5, 2019
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 82.925% when pulling 7445f0e on adybbroe:fix-3a3b-transition-aapp_l1b-reader into 2418be0 on pytroll:master.

@codecov
Copy link

codecov bot commented Jun 5, 2019

Codecov Report

Merging #805 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #805      +/-   ##
==========================================
- Coverage   82.95%   82.94%   -0.02%     
==========================================
  Files         163      163              
  Lines       23605    23608       +3     
==========================================
  Hits        19581    19581              
- Misses       4024     4027       +3
Impacted Files Coverage Δ
satpy/readers/aapp_l1b.py 13.65% <0%> (-0.21%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2418be0...7445f0e. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jun 5, 2019

Codecov Report

Merging #805 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #805      +/-   ##
==========================================
- Coverage   82.95%   82.94%   -0.02%     
==========================================
  Files         163      163              
  Lines       23605    23608       +3     
==========================================
  Hits        19581    19581              
- Misses       4024     4027       +3
Impacted Files Coverage Δ
satpy/readers/aapp_l1b.py 13.65% <0%> (-0.21%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2418be0...7445f0e. Read the comment docs.

@mraspaud mraspaud merged commit fbcf7cb into pytroll:master Jun 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug component:readers enhancement code enhancements, features, improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants