Feature new olcil2 datasets #438

johannesocean · 2018-10-02T06:42:39Z

This adds support for new datasets to the olci l2 reader

Tests added
Tests passed
Passes git diff origin/master **/*py | flake8 --diff
Fully documented

method to apply flags on dataset

stickler-ci · 2018-10-02T06:42:45Z

satpy/readers/nc_olci.py

+class BitFlags(object):
+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID',u'WATER',u'LAND',u'CLOUD',u'SNOW_ICE',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:45Z

satpy/readers/nc_olci.py

+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID',u'WATER',u'LAND',u'CLOUD',u'SNOW_ICE',
+                 u'INLAND_WATER',u'TIDAL',u'COSMETIC',u'SUSPECT',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:46Z

satpy/readers/nc_olci.py

+    """
+    flag_list = ['INVALID',u'WATER',u'LAND',u'CLOUD',u'SNOW_ICE',
+                 u'INLAND_WATER',u'TIDAL',u'COSMETIC',u'SUSPECT',
+                 u'HISOLZEN',u'SATURATED',u'MEGLINT',u'HIGHGLINT',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:46Z

satpy/readers/nc_olci.py

+    flag_list = ['INVALID',u'WATER',u'LAND',u'CLOUD',u'SNOW_ICE',
+                 u'INLAND_WATER',u'TIDAL',u'COSMETIC',u'SUSPECT',
+                 u'HISOLZEN',u'SATURATED',u'MEGLINT',u'HIGHGLINT',
+                 u'WHITECAPS',u'ADJAC',u'WV_FAIL',u'PAR_FAIL',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:46Z

satpy/readers/nc_olci.py

+                 u'INLAND_WATER',u'TIDAL',u'COSMETIC',u'SUSPECT',
+                 u'HISOLZEN',u'SATURATED',u'MEGLINT',u'HIGHGLINT',
+                 u'WHITECAPS',u'ADJAC',u'WV_FAIL',u'PAR_FAIL',
+                 u'AC_FAIL',u'OC4ME_FAIL',u'OCNN_FAIL',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:49Z

satpy/readers/nc_olci.py

+    def getbitmask(self, wqsf, items=[]):
+        """ """
+        items = ["INVALID","SNOW_ICE","INLAND_WATER","SUSPECT",
+                 "AC_FAIL","CLOUD","HISOLZEN","OCNN_FAIL",


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:49Z

satpy/readers/nc_olci.py

+        """ """
+        items = ["INVALID","SNOW_ICE","INLAND_WATER","SUSPECT",
+                 "AC_FAIL","CLOUD","HISOLZEN","OCNN_FAIL",
+                 "CLOUD_MARGIN","CLOUD_AMBIGUOUS","LOWRW","LAND"]


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:42:49Z

satpy/readers/nc_olci.py

+
+#        mask = reduce(np.logical_or, [bflags[item] for item in items])
+#        landmask = bflags[u'LAND']
+#        return mask, landmask   


W291 trailing whitespace

stickler-ci · 2018-10-02T06:42:49Z

satpy/readers/nc_olci.py

+#        mask = reduce(np.logical_or, [bflags[item] for item in items])
+#        landmask = bflags[u'LAND']
+#        return mask, landmask   
+


W293 blank line contains whitespace

stickler-ci · 2018-10-02T06:42:49Z

satpy/readers/nc_olci.py

+#        landmask = bflags[u'LAND']
+#        return mask, landmask   
+
+


W293 blank line contains whitespace

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+class BitFlags(object):
+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID','WATER','LAND','CLOUD','SNOW_ICE',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID','WATER','LAND','CLOUD','SNOW_ICE',
+                 'INLAND_WATER','TIDAL','COSMETIC','SUSPECT',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+    """
+    flag_list = ['INVALID','WATER','LAND','CLOUD','SNOW_ICE',
+                 'INLAND_WATER','TIDAL','COSMETIC','SUSPECT',
+                 'HISOLZEN','SATURATED','MEGLINT','HIGHGLINT',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+    flag_list = ['INVALID','WATER','LAND','CLOUD','SNOW_ICE',
+                 'INLAND_WATER','TIDAL','COSMETIC','SUSPECT',
+                 'HISOLZEN','SATURATED','MEGLINT','HIGHGLINT',
+                 'WHITECAPS','ADJAC','WV_FAIL','PAR_FAIL',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+                 'INLAND_WATER','TIDAL','COSMETIC','SUSPECT',
+                 'HISOLZEN','SATURATED','MEGLINT','HIGHGLINT',
+                 'WHITECAPS','ADJAC','WV_FAIL','PAR_FAIL',
+                 'AC_FAIL','OC4ME_FAIL','OCNN_FAIL',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+                 'KDM_FAIL',
+                 'Extra_2',
+
+                 'CLOUD_AMBIGUOUS','CLOUD_MARGIN','BPAC_ON','WHITE_SCATT',


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:50:51Z

satpy/readers/nc_olci.py

+                 'Extra_2',
+
+                 'CLOUD_AMBIGUOUS','CLOUD_MARGIN','BPAC_ON','WHITE_SCATT',
+                 'LOWRW','HIGHRW']


E231 missing whitespace after ','

stickler-ci · 2018-10-02T06:55:04Z

satpy/readers/nc_olci.py

+class BitFlags(object):
+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID', 'WATER', 'LAND', 'CLOUD', 'SNOW_ICE', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:04Z

satpy/readers/nc_olci.py

+    """Manipulate flags stored bitwise.
+    """
+    flag_list = ['INVALID', 'WATER', 'LAND', 'CLOUD', 'SNOW_ICE', 
+                 'INLAND_WATER', 'TIDAL', 'COSMETIC', 'SUSPECT', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+    """
+    flag_list = ['INVALID', 'WATER', 'LAND', 'CLOUD', 'SNOW_ICE', 
+                 'INLAND_WATER', 'TIDAL', 'COSMETIC', 'SUSPECT', 
+                 'HISOLZEN', 'SATURATED', 'MEGLINT', 'HIGHGLINT', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+    flag_list = ['INVALID', 'WATER', 'LAND', 'CLOUD', 'SNOW_ICE', 
+                 'INLAND_WATER', 'TIDAL', 'COSMETIC', 'SUSPECT', 
+                 'HISOLZEN', 'SATURATED', 'MEGLINT', 'HIGHGLINT', 
+                 'WHITECAPS', 'ADJAC', 'WV_FAIL', 'PAR_FAIL', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+                 'INLAND_WATER', 'TIDAL', 'COSMETIC', 'SUSPECT', 
+                 'HISOLZEN', 'SATURATED', 'MEGLINT', 'HIGHGLINT', 
+                 'WHITECAPS', 'ADJAC', 'WV_FAIL', 'PAR_FAIL', 
+                 'AC_FAIL', 'OC4ME_FAIL', 'OCNN_FAIL', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+                 'AC_FAIL', 'OC4ME_FAIL', 'OCNN_FAIL', 
+
+                 'Extra_1', 
+                 'KDM_FAIL', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+
+                 'Extra_1', 
+                 'KDM_FAIL', 
+                 'Extra_2', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+                 'KDM_FAIL', 
+                 'Extra_2', 
+
+                 'CLOUD_AMBIGUOUS', 'CLOUD_MARGIN', 'BPAC_ON', 'WHITE_SCATT', 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:05Z

satpy/readers/nc_olci.py

+
+    def getbitmask(self, wqsf, items=[]):
+        """ """
+        items = ["INVALID", "SNOW_ICE", "INLAND_WATER", "SUSPECT", 


W291 trailing whitespace

stickler-ci · 2018-10-02T06:55:06Z

satpy/readers/nc_olci.py

+    def getbitmask(self, wqsf, items=[]):
+        """ """
+        items = ["INVALID", "SNOW_ICE", "INLAND_WATER", "SUSPECT", 
+                 "AC_FAIL", "CLOUD", "HISOLZEN", "OCNN_FAIL", 


W291 trailing whitespace

codecov · 2018-10-02T06:58:23Z

Codecov Report

Merging #438 into master will increase coverage by 0.07%.
The diff coverage is 86.2%.

@@            Coverage Diff             @@
##           master     #438      +/-   ##
==========================================
+ Coverage   72.86%   72.94%   +0.07%     
==========================================
  Files         133      132       -1     
  Lines       17582    17546      -36     
==========================================
- Hits        12812    12799      -13     
+ Misses       4770     4747      -23

Impacted Files	Coverage Δ
satpy/tests/reader_tests/__init__.py	`97.22% <100%> (ø)`	⬆️
satpy/readers/nc_olci.py	`42.52% <70.37%> (+19.8%)`	⬆️
satpy/tests/reader_tests/test_nc_olci.py	`93.22% <93.22%> (ø)`
satpy/tests/reader_tests/test_viirs_flood.py
satpy/readers/viirs_edr_flood.py

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 cdd66dc...00bd857. Read the comment docs.

coveralls · 2018-10-02T07:02:58Z

Coverage increased (+0.2%) to 73.078% when pulling 00bd857 on JohannesSMHI:feature-new-olcil2-datasets into cdd66dc on pytroll:master.

mraspaud

Looks good in general.

mraspaud · 2018-10-02T09:15:33Z

satpy/etc/areas.def

@@ -396,6 +396,15 @@ REGION: baws {
 	AREA_EXTENT:    (-475617, 5324430, 924383, 6724430)
 };

+REGION: baws_merc {


Please remove your custom areas from this file. This file format is on it's way out anyway, and for custom area definition, we believe it's better to have them in a local file.

Roger that!

satpy/readers/nc_olci.py

mraspaud · 2018-10-02T11:25:56Z

satpy/readers/nc_olci.py

+        """
+        Arguments:
+        - `value`: an array
+        - `meaning`: a dict


the documentation doesn't match the function prototype, please fix it or remove it.

mraspaud and others added 6 commits April 13, 2018 10:27

Add chl datasets to olci l2 reader

991c88e

Reader OLCI-L2-QCflags

0db907e

Provide a fill value for the olci wqsf dataset

5494120

added area

29601ca

Bitmask OLCI_l2

fdcc80a

method to apply flags on dataset

Added "mask" as dataset

488bd18

stickler-ci reviewed Oct 2, 2018

View reviewed changes

Fixed Stickler comnt

caf2a6a

stickler-ci reviewed Oct 2, 2018

View reviewed changes

fixes

b09748e

stickler-ci reviewed Oct 2, 2018

View reviewed changes

fixes2

b11e08a

fixes3

3d86ecb

fixes4

7249ead

mraspaud requested changes Oct 2, 2018

View reviewed changes

JohannesSMHI added 3 commits October 2, 2018 11:36

deleted areas in areas.def

d31f210

Stickler fixes5

5edfa90

Stickler fixes6

eb023d1

stickler-ci reviewed Oct 2, 2018

View reviewed changes

satpy/readers/nc_olci.py Show resolved Hide resolved

Stickler fixes7

370d0a1

mraspaud reviewed Oct 2, 2018

View reviewed changes

BitFlags doc removed

78b1ba6

mraspaud mentioned this pull request Oct 2, 2018

Add new olci l2 datasets to reader #251

Closed

3 tasks

mraspaud added 2 commits October 2, 2018 15:16

Add some unit tests for the OLCI reader

64485ab

Activate OLCI tests

c180e6a

mraspaud approved these changes Oct 2, 2018

View reviewed changes

Merge branch 'master' into feature-new-olcil2-datasets

5567d15

mraspaud self-assigned this Oct 2, 2018

mraspaud assigned johannesocean Oct 2, 2018

mraspaud added enhancement code enhancements, features, improvements component:readers labels Oct 2, 2018

mraspaud added this to the v0.10 milestone Oct 2, 2018

Merge branch 'master' into feature-new-olcil2-datasets

00bd857

mraspaud merged commit 4e1e149 into pytroll:master Oct 2, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature new olcil2 datasets #438

Feature new olcil2 datasets #438

johannesocean commented Oct 2, 2018 •

edited by mraspaud

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

stickler-ci Oct 2, 2018

codecov bot commented Oct 2, 2018 •

edited

coveralls commented Oct 2, 2018 •

edited

mraspaud left a comment

mraspaud Oct 2, 2018

johannesocean Oct 2, 2018

mraspaud Oct 2, 2018

johannesocean Oct 2, 2018

Feature new olcil2 datasets #438

Feature new olcil2 datasets #438

Conversation

johannesocean commented Oct 2, 2018 • edited by mraspaud

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Oct 2, 2018 • edited

Codecov Report

coveralls commented Oct 2, 2018 • edited

mraspaud left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

johannesocean commented Oct 2, 2018 •

edited by mraspaud

codecov bot commented Oct 2, 2018 •

edited

coveralls commented Oct 2, 2018 •

edited