Isccpg ng #82
Open
Isccpg ng #82
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #82 +/- ##
==========================================
- Coverage 77.61% 74.88% -2.74%
==========================================
Files 21 22 +1
Lines 1452 1505 +53
Branches 107 110 +3
==========================================
Hits 1127 1127
- Misses 301 354 +53
Partials 24 24
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Pull Request Test Coverage Report for Build 9806060353Details
💛 - Coveralls |
The homogenization and recalibration still needs to be done
Pull Request Test Coverage Report for Build 12372240369Details
💛 - Coveralls |
The calibration we want is there in satpy. But the calibration that was used. The nominal is saved with the original data. And it sometimes changes....
And make sure calculations are actually done!
# Conflicts: # level1c4pps/__init__.py
BengtRydberg
reviewed
Jan 8, 2025
| @@ -568,7 +573,7 @@ def compose_filename(scene, out_path, instrument, band=None): | |||
| end_time = band.attrs['end_time'] | |||
| platform_name = scene.attrs['platform'] | |||
| orbit_number = int(scene.attrs['orbit_number']) | |||
| out_path_with_dates = start_time.strftime(out_path) | |||
| out_path_with_dates = datetime.strftime(dt64_to_datetime(start_time), out_path) | |||
There was a problem hiding this comment.
Maybe worth mentioning in the command line interface help that the out_path can be reformatted in this way.
|
|
||
| BANDNAMES = list(PPS_TAGNAMES.keys()) | ||
|
|
||
| coef_slope_chan = ['refl_00_65um', 'refl_00_86um', 'refl_01_60um', |
There was a problem hiding this comment.
Maybe nicer to have put all coefficients related stuff in a yaml file with a format something like this:
coeffcients:
channels:
- refl_00_65um
- refl_00_86um
- refl_01_60um
- temp_03_80um
- temp_06_20um
- temp_07_30um
- temp_08_60um
- temp_09_70um
- temp_11_00um
- temp_12_00um
- temp_13_30um'
satellite:
GOES-16:
day:
slope: [1.00152, 0.946758, 1.00669, 0.926764, 0.991329, 0.999300, 1.01977, 1.03453, 0.996781, 1.02343, 0.863748]
offset: [0.000369844, 0.193868, 0.708022, 18.4795, 1.58729, -0.0312020, -4.93224, -7.83331, 1.13395, -5.51940, 30.5574]
night:
...
| """Nominal calibration is applied, redo with meirnik calibration.""" | ||
| from satpy.readers.seviri_base import MeirinkCalibrationHandler | ||
| start_time = dt64_to_datetime(scene["refl_00_65um"].attrs["start_time"]) | ||
| channel_name = {"refl_00_65um": "VIS006", |
There was a problem hiding this comment.
I prefer to define constants like this and the ones below in the top of the module.
| channel_name = {"refl_00_65um": "VIS006", | ||
| "refl_00_86um": "VIS008", | ||
| "refl_01_60um": "IR_016"} | ||
| platform_id = {55: 321, |
There was a problem hiding this comment.
do you actually need the 321 and 324 ids?
| "IR_016": 23.112} | ||
| }} | ||
| for wmo_id in platform_id: | ||
| for band in channel_name: |
There was a problem hiding this comment.
you could do: for wmo_id, platform_id in PLATFORM_ID.items(): and for band, channel_name in CHANNEL_NAME.items(): to increase readability if you follow the advise above.
| update = ((dwmo_id == wmo_id) & (data > 0) & (sol_zen < dn_discr)) | ||
| scene[band].values = np.where(update, scene[band].values * k + c, scene[band].values) | ||
|
|
||
| if (illum == '_nig'): |
| f" with respect to SEVIRI on MSG4 using y={k} * x + {c}") | ||
| dn_discr = 90 | ||
| if (illum == '_day'): | ||
| update = ((dwmo_id == wmo_id) & (data > 0) & (sol_zen < dn_discr)) |
There was a problem hiding this comment.
no need for the outermost parenthesis
| scene[band].values = np.where(update, scene[band].values * k + c, scene[band].values) | ||
|
|
||
| if (illum == '_nig'): | ||
| update = ((dwmo_id == wmo_id) & (data > 0) & (sol_zen >= dn_discr)) |
| """Homogenize data to Meteosat-11.""" | ||
| sol_zen = scene["sunzenith"] | ||
| for band in BANDNAMES: | ||
| for wmo_id in [270, 271, 173, 55]: |
There was a problem hiding this comment.
for wmo_id in satellite_names:
for illumination in ["_day", "_night"]:
homogenize_channel(scene, wmo_id, illumination, band, sol_zen)
|
|
||
| def get_encoding_isccpng(scene): | ||
| """Get netcdf encoding for all datasets.""" | ||
| return get_encoding(scene, |
There was a problem hiding this comment.
should fit on one line.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Converter for ISCCP-NG to seviri PPS level1c format
pytest level1c4ppsflake8