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

Add support for CMIC product from PPSv2021 #1992

Merged
merged 7 commits into from Feb 18, 2022

Conversation

mraspaud
Copy link
Member

The CPP product has been renamed in NWCSAF 2021 to CMIC, and even if the datasets inside are the same, the name of the variables in the nc files have been changed. This PR allows reading either file transparently by introducing file_keys and prefixes to the nwcsaf-nc reader.

Moreover, the default composites for these products have been updated.

  • Tests added

@mraspaud mraspaud added enhancement code enhancements, features, improvements component:readers labels Jan 24, 2022
@mraspaud mraspaud self-assigned this Jan 24, 2022
@codecov
Copy link

codecov bot commented Jan 24, 2022

Codecov Report

Merging #1992 (0f1a93c) into main (3e94d59) will increase coverage by 0.10%.
The diff coverage is 93.10%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1992      +/-   ##
==========================================
+ Coverage   93.54%   93.64%   +0.10%     
==========================================
  Files         279      282       +3     
  Lines       41322    41823     +501     
==========================================
+ Hits        38654    39165     +511     
+ Misses       2668     2658      -10     
Flag Coverage Δ
behaviourtests 4.76% <0.00%> (-0.02%) ⬇️
unittests 94.17% <93.10%> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
satpy/readers/nwcsaf_nc.py 73.66% <68.75%> (+11.51%) ⬆️
satpy/tests/reader_tests/test_nwcsaf_nc.py 100.00% <100.00%> (ø)
satpy/_compat.py 75.00% <0.00%> (-6.82%) ⬇️
satpy/modifiers/_crefl.py 93.02% <0.00%> (-1.17%) ⬇️
satpy/modifiers/_crefl_utils.py 92.04% <0.00%> (-1.14%) ⬇️
satpy/modifiers/angles.py 96.68% <0.00%> (ø)
satpy/tests/test_dataset.py 100.00% <0.00%> (ø)
satpy/readers/yaml_reader.py 96.55% <0.00%> (ø)
satpy/tests/test_modifiers.py 100.00% <0.00%> (ø)
satpy/tests/reader_tests/test_ahi_hrit.py 100.00% <0.00%> (ø)
... and 21 more

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 3e94d59...0f1a93c. Read the comment docs.

@coveralls
Copy link

coveralls commented Jan 24, 2022

Coverage Status

Coverage increased (+0.1%) to 94.103% when pulling 0f1a93c on mraspaud:feature-pps-2021-cmic into 3e94d59 on pytroll:main.

@mraspaud
Copy link
Member Author

@ninahakansson feel free to have a look!

unzip.return_value = ''
self.scn = NcNWCSAF('filename', {}, {})
self.filehandler_class = NcNWCSAF
self.scn = self.filehandler_class('filename', {}, {})
Copy link
Member

Choose a reason for hiding this comment

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

Can this property be renamed to avoid confusion? I was already confused when you set self.scn.nc in one of the tests since that isn't something a Scene should have.

Copy link
Member Author

@mraspaud mraspaud Feb 18, 2022

Choose a reason for hiding this comment

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

ah yes, good point

@mraspaud mraspaud merged commit 0474f55 into pytroll:main Feb 18, 2022
@mraspaud mraspaud deleted the feature-pps-2021-cmic branch February 18, 2022 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:readers enhancement code enhancements, features, improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants