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.

Sign up for GitHub

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 new mask datasets for olci l2 and refactor a bit #1767

Closed
wants to merge 21 commits into from
Closed

Add new mask datasets for olci l2 and refactor a bit #1767

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c3cc70a
Add new mask datasets for olci l2 and refactor a bit
mraspaud Jul 19, 2021
2365170
Refactor
mraspaud Jul 19, 2021
5972668
Refactor meteo file reading (olci l2)
mraspaud Jul 19, 2021
3a79b17
Fix the lru_cache
mraspaud Jul 19, 2021
1457f8b
Refactor olci angles and improve tests
mraspaud Jul 20, 2021
b6e02e1
Refactor tests
mraspaud Jul 20, 2021
b1b77e1
Remove object inheritance
mraspaud Jul 20, 2021
506d7d1
Refactor/simplify angle interpolation method
mraspaud Jul 20, 2021
d48cefb
Rename method
mraspaud Jul 20, 2021
0ba72a5
Bugfix
mraspaud Jul 20, 2021
20fde03
Clean up
mraspaud Jul 20, 2021
c17eeb3
Convert static method to function
mraspaud Jul 20, 2021
708ab44
Remove unneeded exceptions
mraspaud Jul 20, 2021
7342e32
Expose bitflags as an attribute of wqsf
mraspaud Aug 10, 2021
d2c3ec4
Add a couple dataset, and cleanup the attributes of others
mraspaud Aug 10, 2021
9a597ee
Make BitFlags independent of the data
mraspaud Aug 10, 2021
d605392
Add info attrs to datasets
mraspaud Aug 10, 2021
ef2c48b
Merge branch 'main' into feature-olci-l2-datasets-take-2
mraspaud Apr 26, 2022
9cb463a
Fix merge
mraspaud Apr 26, 2022
6aa7dc0
Remove method caching
mraspaud Apr 26, 2022
67489e0
Use properties for bitmask attribute access
mraspaud Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion satpy/etc/readers/olci_l2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ file_types:
file_reader: !!python/name:satpy.readers.olci_nc.NCOLCI2
file_patterns: ['{mission_id:3s}_OL_2_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/tsm_nn.nc']
esa_l2_wqsf:
file_reader: !!python/name:satpy.readers.olci_nc.NCOLCI2
file_reader: !!python/name:satpy.readers.olci_nc.NCOLCI2Flags
file_patterns: ['{mission_id:3s}_OL_2_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/wqsf.nc']
esa_angles:
file_reader: !!python/name:satpy.readers.olci_nc.NCOLCIAngles
Expand Down Expand Up @@ -399,6 +399,27 @@ datasets:
coordinates: [longitude, latitude]
file_type: esa_l2_wqsf
nc_key: WQSF
masked_items: [ "INVALID", "SNOW_ICE", "INLAND_WATER", "SUSPECT",
"AC_FAIL", "CLOUD", "HISOLZEN", "OCNN_FAIL",
"CLOUD_MARGIN", "CLOUD_AMBIGUOUS", "LOWRW", "LAND" ]

cloud_mask:
name: cloud_mask
sensor: olci
resolution: 300
coordinates: [longitude, latitude]
file_type: esa_l2_wqsf
nc_key: WQSF
masked_items: [ "CLOUD" ]

ocnn_mask:
name: ocnn_mask
sensor: olci
resolution: 300
coordinates: [longitude, latitude]
file_type: esa_l2_wqsf
nc_key: WQSF
masked_items: [ "OCNN_FAIL" ]

solar_zenith_angle:
name: solar_zenith_angle
Expand Down
Loading