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 a reader for Meris L2 data #1678

Merged
merged 21 commits into from Nov 16, 2022
Merged

Conversation

johannesocean
Copy link
Contributor

@johannesocean johannesocean commented May 19, 2021

New reader for ENVISAT-MERIS data. The 4th generation reprocessing of MERIS data implements a Sentinel 3 like format including Level 2 products and TOA-radiances in the same dataset package. Hence, we can use the same reader as for the OLCI sensor. Basically we only add a yaml-file (meris_nc_sen3) and some minor changes to the OLCI-scripts

I will follow up with an extension of the TOA datasets in the upcoming weeks..

  • Tests added
  • Fully documented

Johansson Johannes added 4 commits May 19, 2021 11:33
satpy/readers/meris_l2_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_l2_sen3.py Outdated Show resolved Hide resolved
@johannesocean johannesocean reopened this May 19, 2021
@johannesocean johannesocean marked this pull request as draft May 19, 2021 13:54
@codecov
Copy link

codecov bot commented May 20, 2021

Codecov Report

Merging #1678 (4b520ee) into main (c34aebc) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1678      +/-   ##
==========================================
+ Coverage   94.30%   94.32%   +0.01%     
==========================================
  Files         306      308       +2     
  Lines       46043    46168     +125     
==========================================
+ Hits        43421    43546     +125     
  Misses       2622     2622              
Flag Coverage Δ
behaviourtests 4.61% <0.00%> (-0.02%) ⬇️
unittests 94.96% <100.00%> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
satpy/readers/meris_nc_sen3.py 100.00% <100.00%> (ø)
satpy/readers/olci_nc.py 93.96% <100.00%> (+0.06%) ⬆️
satpy/tests/reader_tests/test_meris_nc.py 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@coveralls
Copy link

coveralls commented May 20, 2021

Coverage Status

Coverage increased (+0.01%) to 94.908% when pulling 4b520ee on johannesocean:feature-meris-l2 into c34aebc on pytroll:main.

introducing self.reflectance_prefix and self.reflectance_suffix to NCOLCIChannelBase
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
satpy/readers/meris_nc_sen3.py Outdated Show resolved Hide resolved
@johannesocean johannesocean marked this pull request as ready for review May 26, 2021 09:20
@mraspaud
Copy link
Member

mraspaud commented Jun 1, 2021

@JohannesSMHI Great start, nice that so much of the Olci reader can be reused! Now we are just waiting for the tests :)

@mraspaud mraspaud changed the title Feature meris l2 Add a reader for Meris L2 data Jun 1, 2021
@johannesocean
Copy link
Contributor Author

@mraspaud Goodie! Should I create the tests as well, or will someone else do that?

@mraspaud
Copy link
Member

mraspaud commented Jun 2, 2021

I would say that you are probably the best person to do that :)

More or less copied the code from test_olci_nc.py

import numpy as np

from satpy.readers.olci_nc import (
Copy link
Contributor

Choose a reason for hiding this comment

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

F401 'satpy.readers.olci_nc.NCOLCILowResData' imported but unused

Copy link
Member

Choose a reason for hiding this comment

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

@JohannesSMHI is this solved?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mraspaud yep, that is solved.. but how about all the changes you did with the olci_l2. reader before the summer (eg. the BitFlags class) ? will the merge take care of that or do we need to adjust before we merge?

Copy link
Member

Choose a reason for hiding this comment

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

Should be fine!

satpy/tests/reader_tests/test_meris_nc.py Outdated Show resolved Hide resolved
satpy/tests/reader_tests/test_meris_nc.py Outdated Show resolved Hide resolved
@johannesocean
Copy link
Contributor Author

@mraspaud would you consider this PR to be "Fully documented" ?

@gerritholl
Copy link
Collaborator

@JohannesSMHI This sadly seems to have some merge conflicts by now. Any chance of looking into those?

@johannesocean
Copy link
Contributor Author

@gerritholl, I´ll try to find time for this after my vaccation :)

@adybbroe
Copy link
Contributor

@johannesocean @gerritholl and @mraspaud
I just resolved some straight forward merge conflicts. Is this now getting ready to merge?

@adybbroe adybbroe added enhancement code enhancements, features, improvements component:readers labels Nov 15, 2022
Copy link
Member

@mraspaud mraspaud left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @johannesocean for the PR and @adybbroe for finalizing!

@mraspaud mraspaud merged commit f9c2070 into pytroll:main Nov 16, 2022
@johannesocean
Copy link
Contributor Author

@mraspaud @adybbroe Glad to hear this has been merged! :)

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
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants