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 level-1 readers for the arctic weather satelliter data #2565

Merged
merged 59 commits into from
Jan 14, 2025
Merged

Add level-1 readers for the arctic weather satelliter data #2565

Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
dca7640
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Sep 4, 2023
a35b1de
First version of the l1b reader for the Arctic Weather Satellite
Sep 4, 2023
4d6fee9
Fix longitudes to be bbetween -180 and 180 and other fixes for geo-lo…
Sep 22, 2023
5c3a7d3
Add some first basic humidity RGB recipes
Sep 22, 2023
8f0d1bf
Start working on tests for aws l1b
mraspaud Nov 6, 2023
7191df1
Finalize aws_l1b refactoring and tests
mraspaud Nov 7, 2023
6b5a97b
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
mraspaud Nov 7, 2023
e526ff5
Replace single quotes with double quotes
mraspaud Nov 7, 2023
f039715
Fix aws yaml file
mraspaud Nov 8, 2023
47821d6
Fix aws reader according to review comments
mraspaud Nov 30, 2023
9e9439a
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Feb 21, 2024
95f744e
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Sep 28, 2024
dea6a67
Fixed for latest real-data (not yet final format)
Oct 1, 2024
70bbc86
Changing the humidity-surface RGB to consider the lowest peaking abso…
Oct 1, 2024
a84d874
A first draft fix of the viewing geometry per feed horn
Oct 10, 2024
b6f9b99
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Nov 8, 2024
b22514c
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Nov 9, 2024
da735b3
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Nov 19, 2024
c1b2d9d
Add support for reading the EUMETSAT AWS/EPS-Sterna L1b data
Dec 11, 2024
b2775eb
Add support for reading ESA AWS L1c
Dec 11, 2024
41e7975
Fix the tests
Dec 11, 2024
441ee06
Adapt test to latest AWS l1b format
Dec 11, 2024
1437cd1
Fix tests and add some basic RGB recipes for AWS
Dec 11, 2024
5502cfd
Merge branch 'main' into add-arctic-weather-satelliter-l1b-reader
Dec 11, 2024
23fcf3c
Fix for xarray > 2024.09, and leave stand alone datatree
Dec 12, 2024
b8b08e4
First version of the l1b reader for the Arctic Weather Satellite
Dec 13, 2024
0c28004
Fix the naming - The AWS/EPS-Sterna sensor is named "MWR"
Dec 15, 2024
9ec30bc
Refactor tests and fix naming for AWS/EPS-Sterna Radiometer = MWR
Dec 16, 2024
3e16010
Merge branch 'main' of https://github.com/pytroll/satpy into add-arct…
Dec 16, 2024
bf450fd
Revert back to the old (current) version
Dec 16, 2024
8bee181
Bugfix
Dec 16, 2024
3badb8d
Bugfix
Dec 16, 2024
a6414c9
Refactor and share code between the l1b and l1c readers
Dec 16, 2024
a5d472a
Fix tests
Dec 16, 2024
55c999e
Refactor and add test coverage for the ESA AWS Level-1c reader
Dec 18, 2024
110cd9c
Update satpy/etc/composites/mwr.yaml
adybbroe Dec 19, 2024
7347fb0
Update satpy/tests/reader_tests/conftest.py
adybbroe Dec 19, 2024
1cf434c
Fix file naming and secure composite recipe consistency
Dec 19, 2024
1e49dd5
Update satpy/readers/mwr_l1b.py
adybbroe Dec 19, 2024
62c3b36
Remove redundant MWR specific enhancement
Dec 19, 2024
7815186
Merge branch 'add-arctic-weather-satelliter-l1b-reader' of github.com…
Dec 19, 2024
b2f0e14
Update satpy/etc/readers/eps_sterna_mwr_l1b_nc.yaml
adybbroe Dec 19, 2024
1ef7cc3
Fix spelling
adybbroe Dec 19, 2024
afe175b
Update satpy/tests/reader_tests/test_aws1_mwr_l1c.py
adybbroe Dec 19, 2024
3a71be5
Update satpy/readers/mwr_l1c.py
adybbroe Dec 19, 2024
49fb564
Update satpy/tests/reader_tests/test_aws1_mwr_l1c.py
adybbroe Dec 19, 2024
ba126cc
Fix sensor name and adjust yaml files accordingly + fix a few issues …
Dec 19, 2024
f03f796
Merge branch 'add-arctic-weather-satelliter-l1b-reader' of github.com…
Dec 19, 2024
0eb261a
Fix file name pattern
Dec 19, 2024
05d952e
Refactor the AWS/EPS-STerna tests
Dec 19, 2024
152b45e
Fixed datetime import syntax - use custom practice
Dec 20, 2024
4ad6ef4
Remove redundant timedelta import
Dec 20, 2024
2b8aecb
Clean up and improve file patterns for AWS/EPS-Sterna
Dec 20, 2024
cd21dd2
Fix short/long names and make improvements raised in the review
Dec 20, 2024
a703757
Add missing enhancement
Dec 20, 2024
a17b8b3
Refactor AWS/EPS-Sterna l1b file fixtures
Jan 5, 2025
c7d5fe9
Refactoring tests reusing the l1b file creation part also for level-1c
Jan 6, 2025
d4654d1
Fix right processing level in tmp file name
Jan 7, 2025
0b9760c
Improvements following review comments.
Jan 13, 2025
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
46 changes: 46 additions & 0 deletions satpy/etc/composites/mwr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
sensor_name: mwr
Copy link
Member

Choose a reason for hiding this comment

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

This is a microwave instrument right? Do we need to define a "base" sensor type for "microwave" making this sensor_name: microwave/mwr? Or does this work as-is and we won't worry about a shared set of "microwave" composites? If this isn't microwave, then this should probably be sensor_name: visir/mwr, right?

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, you are right. I think it sounds right to have a "microwave" group here. I was, however, not sure how this works. But I try add it now.... Just need to do some system, testing...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks okay I believe.


composites:
mw183_humidity:
standard_name: mw183_humidity
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
- name: '11'
- name: '13'
- name: '15'

mw183_humidity_surface:
compositor: !!python/name:satpy.composites.RGBCompositor
prerequisites:
- name: '9'
- name: '10'
- name: '12'
standard_name: mw183_humidity_surface

mw325_humidity_surface:
compositor: !!python/name:satpy.composites.RGBCompositor
prerequisites:
- name: '9'
- name: '10'
- name: '19'
standard_name: mw325_humidity_surface

mw325_humidity:
compositor: !!python/name:satpy.composites.RGBCompositor
prerequisites:
- name: '16'
- name: '18'
- name: '19'
standard_name: mw325_humidity

ch1_tbs_colors:
compositor: !!python/name:satpy.composites.SingleBandCompositor
prerequisites:
- name: '1'
standard_name: tbs_colors
adybbroe marked this conversation as resolved.
Show resolved Hide resolved

ch10_tbs_colors:
compositor: !!python/name:satpy.composites.SingleBandCompositor
prerequisites:
- name: '10'
standard_name: tbs_colors
15 changes: 15 additions & 0 deletions satpy/etc/enhancements/generic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,3 +1289,18 @@ enhancements:
image_ready:
standard_name: image_ready
operations: []

mw183_humidity:
# matches EPS-Sterna and AWS MWR, and ATMS and MHS
standard_name: mw183_humidity
operations:
- name: stretch
method: !!python/name:satpy.enhancements.stretch
kwargs:
stretch: crude
min_stretch: [290, 290, 290]
max_stretch: [190, 190, 190]
- name: gamma
method: !!python/name:satpy.enhancements.gamma
kwargs:
gamma: [1.5, 1.2, 1.2]
43 changes: 43 additions & 0 deletions satpy/etc/enhancements/mwr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
enhancements:

mw183_humidity_surface:
standard_name: mw183_humidity_surface
operations:
- name: inverse
method: !!python/name:satpy.enhancements.invert
args:
- [true, true, true]
- name: stretch
method: !!python/name:satpy.enhancements.stretch
kwargs: {stretch: linear}
- name: gamma
method: !!python/name:satpy.enhancements.gamma
kwargs: {gamma: 1.2}

mw325_humidity:
standard_name: mw325_humidity
operations:
- name: inverse
method: !!python/name:satpy.enhancements.invert
args:
- [true, true, true]
- name: stretch
method: !!python/name:satpy.enhancements.stretch
kwargs: {stretch: linear}
- name: gamma
method: !!python/name:satpy.enhancements.gamma
kwargs: {gamma: 1.2}

mw325_humidity_surface:
standard_name: mw325_humidity_surface
operations:
- name: inverse
method: !!python/name:satpy.enhancements.invert
args:
- [true, true, true]
- name: stretch
method: !!python/name:satpy.enhancements.stretch
kwargs: {stretch: linear}
- name: gamma
method: !!python/name:satpy.enhancements.gamma
kwargs: {gamma: 1.2}
adybbroe marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion satpy/etc/readers/atms_sdr_hdf5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ reader:
file_types:
atms_sdr_hdf5:
file_reader: !!python/name:satpy.readers.atms_sdr_hdf5.ATMS_SDR_FileHandler
file_patterns: ['SATMS_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time:%Y%m%d%H%M%S%f}_{source}.h5', 'GATMO_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time:%Y%m%d%H%M%S%f}_{source}.h5']
file_patterns: ['SATMS_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time:%Y%m%d%H%M%S%f}_{source}.h5', 'GATMO_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time:%Y%m%d%H%M%S%f}_{source}.h5','GATMO-SATMS_{platform_shortname}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time:%Y%m%d%H%M%S%f}_{source}.h5']
# Example filenames
# GATMO_j01_d20221220_t0910240_e0921356_b26361_c20221220100456680030_cspp_dev.h5
# SATMS_j01_d20221220_t0910240_e0921356_b26361_c20221220100456348770_cspp_dev.h5
Expand Down
Loading
Loading