Skip to content

Fci l1c handle other coverage #3112

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

Merged
merged 3 commits into from
Apr 23, 2025
Merged

Fci l1c handle other coverage #3112

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2524a2
feat : Implement handling for different coverages
ClementLaplace Apr 17, 2025
a170b8e
test : Ipmlement test related to the differents coverages
ClementLaplace Apr 17, 2025
f8c8737
test: Add test for test_count_in_repeat_cycle_rc_period_min concernin…
ClementLaplace Apr 22, 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
20 changes: 14 additions & 6 deletions satpy/readers/fci_l1c_nc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,20 +248,28 @@ def rc_period_min(self):
elif self.filename_info["coverage"] in ["FD", "AF"]:
return 10
else:
raise NotImplementedError(f"coverage for {self.filename_info['coverage']}"
" not supported by this reader")
logger.debug(f"Coverage \"{self.filename_info['coverage']}\" not recognised. "
f"Using observation times for nominal times.")
return None


@property
def nominal_start_time(self):
"""Get nominal start time."""
rc_date = self.observation_start_time.replace(hour=0, minute=0, second=0, microsecond=0)
return rc_date + dt.timedelta(
minutes=(self.filename_info["repeat_cycle_in_day"] - 1) * self.rc_period_min)
if self.rc_period_min is None:
return self.filename_info["start_time"]
else:
rc_date = self.observation_start_time.replace(hour=0, minute=0, second=0, microsecond=0)
return rc_date + dt.timedelta(
minutes=(self.filename_info["repeat_cycle_in_day"] - 1) * self.rc_period_min)

@property
def nominal_end_time(self):
"""Get nominal end time."""
return self.nominal_start_time + dt.timedelta(minutes=self.rc_period_min)
if self.rc_period_min is None:
return self.filename_info["end_time"]
else:
return self.nominal_start_time + dt.timedelta(minutes=self.rc_period_min)

@property
def observation_start_time(self):
Expand Down
115 changes: 78 additions & 37 deletions satpy/tests/reader_tests/test_fci_l1c_nc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@
"CHK-BODY--L2P-NC4E_C_EUMT_20170410114434_GTT_DEV_"
"20170410113925_20170410113934_N__C_0070_0067.nc"
],
"fdhsi_error": [
"W_XX-EUMETSAT-Darmstadt,IMG+SAT,MTI1+FCI-1C-RRAD-FDHSI-FDD--"
"CHK-BODY--L2P-NC4E_C_EUMT_20170410114434_GTT_DEV_"
"20170410113925_20170410113934_N__C_0070_0067.nc"
],
"fdhsi_iqti": [
"W_XX-EUMETSAT-Darmstadt,IMG+SAT,MTI1+FCI-1C-RRAD-FDHSI-FD--"
"CHK-BODY--MON-NC4_C_EUMT_20240307233956_IQTI_DEV_"
Expand All @@ -183,7 +178,14 @@
],
"hrfi_q4": ["W_XX-EUMETSAT-Darmstadt,IMG+SAT,MTI1+FCI-1C-RRAD-HRFI-Q4--"
"CHK-BODY--DIS-NC4E_C_EUMT_20230723025408_IDPFI_DEV"
"_20230722120000_20230722120027_N_JLS_C_0289_0001.nc"]
"_20230722120000_20230722120027_N_JLS_C_0289_0001.nc"],
"hrfi_other_coverage": ["W_XX-EUMETSAT-Darmstadt,IMG+SAT,MTI1+FCI-1C-RRAD-HRFI-xx--"
"CHK-BODY--DIS-NC4E_C_EUMT_20230723025408_IDPFI_DEV"
"_20230722120000_20230722120027_N_JLS_C_0289_0001.nc"],
"fdhsi_other_coverage": ["W_XX-EUMETSAT-Darmstadt,IMG+SAT,MTI1+FCI-1C-RRAD-FDHSI-xx--"
"CHK-BODY--DIS-NC4E_C_EUMT_20230723025408_IDPFI_DEV_"
"20230722120000_20230722120027_N_JLS_C_0289_0001.nc"
],
}


Expand Down Expand Up @@ -607,29 +609,28 @@ def FakeFCIFileHandlerFDHSI_fixture():


@pytest.fixture
def FakeFCIFileHandlerFDHSIError_fixture():
"""Get a fixture for the fake FDHSI filehandler, including channel and file names."""
with mocked_basefilehandler(FakeFCIFileHandlerFDHSI):
def FakeFCIFileHandlerFDHSIIQTI_fixture():
"""Get a fixture for the fake FDHSI IQTI filehandler, including channel and file names."""
with mocked_basefilehandler(FakeFCIFileHandlerFDHSIIQTI):
param_dict = {
"filetype": "fci_l1c_fdhsi",
"channels": CHANS_FDHSI,
"filenames": TEST_FILENAMES["fdhsi_error"]
"filenames": TEST_FILENAMES["fdhsi_iqti"]
}
yield param_dict


@pytest.fixture
def FakeFCIFileHandlerFDHSIIQTI_fixture():
"""Get a fixture for the fake FDHSI IQTI filehandler, including channel and file names."""
with mocked_basefilehandler(FakeFCIFileHandlerFDHSIIQTI):
def FakeFCIFileHandlerFDHSIOtherCoverage_fixture():
"""Get a fixture for the fake FDHSI filehandler for coverages not defined, including channel and file names."""
with mocked_basefilehandler(FakeFCIFileHandlerFDHSI):
param_dict = {
"filetype": "fci_l1c_fdhsi",
"channels": CHANS_FDHSI,
"filenames": TEST_FILENAMES["fdhsi_iqti"]
"filenames": TEST_FILENAMES["fdhsi_other_coverage"]
}
yield param_dict


@pytest.fixture
def FakeFCIFileHandlerFDHSIQ4_fixture():
"""Get a fixture for the fake FDHSI Q4 filehandler, including channel and file names."""
Expand All @@ -653,6 +654,16 @@ def FakeFCIFileHandlerHRFI_fixture():
}
yield param_dict

@pytest.fixture
def FakeFCIFileHandlerHRFIOtherCoverage_fixture():
"""Get a fixture for the fake HRFI filehandler for coverages not defined, including channel and file names."""
with mocked_basefilehandler(FakeFCIFileHandlerHRFI):
param_dict = {
"filetype": "fci_l1c_hrfi",
"channels": CHANS_HRFI,
"filenames": TEST_FILENAMES["hrfi_other_coverage"]
}
yield param_dict

@pytest.fixture
def FakeFCIFileHandlerHRFIIQTI_fixture():
Expand Down Expand Up @@ -709,7 +720,11 @@ class ModuleTestFCIL1cNcReader:
"hrfi_iqti": {"channels": CHANS_HRFI,
"filenames": TEST_FILENAMES["hrfi_iqti"]},
"fdhsi_q4": {"channels": CHANS_FDHSI,
"filenames": TEST_FILENAMES["fdhsi_q4"]}}
"filenames": TEST_FILENAMES["fdhsi_q4"]},
"fdhsi_other_coverage": {"channels": CHANS_FDHSI,
"filenames": TEST_FILENAMES["fdhsi_other_coverage"]},
"hrfi_other_coverage": {"channels": CHANS_HRFI,
"filenames": TEST_FILENAMES["hrfi_other_coverage"]}}

@staticmethod
def _get_type_ter_AF(channel):
Expand Down Expand Up @@ -822,7 +837,9 @@ def test_file_pattern(self, reader_configs, filenames):
TEST_FILENAMES["hrfi_q4"][0].replace("BODY", "TRAIL"),
TEST_FILENAMES["fdhsi_q4"][0].replace("BODY", "TRAIL"),
TEST_FILENAMES["fdhsi_iqti"][0].replace("BODY", "TRAIL"),
TEST_FILENAMES["hrfi_iqti"][0].replace("BODY", "TRAIL")])
TEST_FILENAMES["hrfi_iqti"][0].replace("BODY", "TRAIL"),
TEST_FILENAMES["hrfi_other_coverage"][0].replace("BODY", "TRAIL"),
TEST_FILENAMES["fdhsi_other_coverage"][0].replace("BODY", "TRAIL")])
def test_file_pattern_for_TRAIL_file(self, reader_configs, filenames):
"""Test file pattern matching for TRAIL files, which should not be picked up."""
from satpy.readers import load_reader
Expand All @@ -832,12 +849,16 @@ def test_file_pattern_for_TRAIL_file(self, reader_configs, filenames):
assert len(files) == 0

@pytest.mark.parametrize("calibration", ["counts", "radiance", "brightness_temperature", "reflectance"])
@pytest.mark.parametrize(("fh_param", "res_type"), [(lazy_fixture("FakeFCIFileHandlerFDHSI_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerHRFI_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), "hdfi")])
@pytest.mark.parametrize(("fh_param", "res_type"), [
(lazy_fixture("FakeFCIFileHandlerFDHSI_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerHRFI_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), "hrfi"),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture"), "hdfi"),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"), "hrfi"),
])
def test_load_calibration(self, reader_configs, fh_param,
caplog, calibration, res_type):
"""Test loading with counts,radiance,reflectance and bt."""
Expand Down Expand Up @@ -915,7 +936,10 @@ def test_load_calibration_af(self, FakeFCIFileHandlerAF_fixture, reader_configs,
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"))])
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))
])
def test_orbital_parameters_attr(self, reader_configs, fh_param):
"""Test the orbital parameter attribute."""
reader = _get_reader_with_filehandlers(fh_param["filenames"], reader_configs)
Expand Down Expand Up @@ -945,7 +969,9 @@ def test_orbital_parameters_attr(self, reader_configs, fh_param):
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["hrfi"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["fdhsi"]),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["hrfi"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["fdhsi"])
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["fdhsi"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["fdhsi"]),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"), EXPECTED_POS_INFO_FOR_FILETYPE["hrfi"])
])
def test_get_segment_position_info(self, reader_configs, fh_param, expected_pos_info):
"""Test the segment position info method."""
Expand All @@ -969,13 +995,15 @@ def test_not_get_segment_info_called_af(self, FakeFCIFileHandlerAF_fixture, read
gspi.assert_not_called()

@pytest.mark.parametrize("calibration", ["index_map", "pixel_quality"])
@pytest.mark.parametrize(("fh_param", "expected_res_n"), [(lazy_fixture("FakeFCIFileHandlerFDHSI_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerHRFI_fixture"), 4),
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), 4),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), 4),
(
lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), 16)])
@pytest.mark.parametrize(("fh_param", "expected_res_n"), [
(lazy_fixture("FakeFCIFileHandlerFDHSI_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerHRFI_fixture"), 4),
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), 4),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), 4),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture"), 16),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"), 4)])
def test_load_map_and_pixel(self, reader_configs, fh_param, expected_res_n, calibration):
"""Test loading of index_map and pixel_quality."""
reader = _get_reader_with_filehandlers(fh_param["filenames"], reader_configs)
Expand Down Expand Up @@ -1023,7 +1051,9 @@ def test_load_map_and_pixel_af(self, FakeFCIFileHandlerAF_fixture, reader_config
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"))])
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))])
def test_load_aux_data(self, reader_configs, fh_param):
"""Test loading of auxiliary data."""
from satpy.readers.fci_l1c_nc import AUX_DATA
Expand All @@ -1048,6 +1078,8 @@ def test_load_aux_data(self, reader_configs, fh_param):
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))
])
def test_platform_name(self, reader_configs, fh_param):
"""Test that platform name is exposed.
Expand Down Expand Up @@ -1132,6 +1164,8 @@ def test_count_in_repeat_cycle_rc_period_min_AF(self, FakeFCIFileHandlerAF_fixtu
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))
])
def test_compute_earth_sun_parameter(self, reader_configs, fh_param):
"""Test the computation of the sun_earth_parameter."""
Expand All @@ -1145,19 +1179,24 @@ def test_compute_earth_sun_parameter_AF(self, FakeFCIFileHandlerAF_fixture, read
fh_param = FakeFCIFileHandlerAF_fixture
self._compare_sun_earth_distance(f"{fh_param['filetype']}_{channel}_{resolution}", fh_param, reader_configs)

@pytest.mark.parametrize(("fh_param"), [(lazy_fixture("FakeFCIFileHandlerFDHSIError_fixture"))])
def test_rc_period_min_error(self, reader_configs, fh_param):
@pytest.mark.parametrize(("fh_param"), [ (lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))])
def test_rc_period_min_log_message_other_coverage(self, reader_configs, fh_param, caplog):
"""Test the rc_period_min error."""
with pytest.raises(NotImplementedError):
with caplog.at_level(logging.DEBUG):
_get_reader_with_filehandlers(fh_param["filenames"], reader_configs)
assert any('Coverage "xx" not recognised. Using observation times for nominal times.'
in message for message in caplog.messages)

@pytest.mark.parametrize(("fh_param", "expected_area"), [
(lazy_fixture("FakeFCIFileHandlerFDHSI_fixture"), ["mtg_fci_fdss_1km", "mtg_fci_fdss_2km"]),
(lazy_fixture("FakeFCIFileHandlerHRFI_fixture"), ["mtg_fci_fdss_500m", "mtg_fci_fdss_1km"]),
(lazy_fixture("FakeFCIFileHandlerHRFIQ4_fixture"), ["mtg_fci_fdss_500m", "mtg_fci_fdss_1km"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture"), ["mtg_fci_fdss_1km", "mtg_fci_fdss_2km"]),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture"), ["mtg_fci_fdss_500m", "mtg_fci_fdss_1km"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), ["mtg_fci_fdss_1km", "mtg_fci_fdss_2km"])
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture"), ["mtg_fci_fdss_1km", "mtg_fci_fdss_2km"]),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture"), ["mtg_fci_fdss_1km", "mtg_fci_fdss_2km"]),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"), ["mtg_fci_fdss_500m", "mtg_fci_fdss_1km"])
])
def test_area_definition_computation(self, reader_configs, fh_param, expected_area):
"""Test that the geolocation computation is correct."""
Expand Down Expand Up @@ -1189,6 +1228,8 @@ def test_area_definition_computation(self, reader_configs, fh_param, expected_ar
(lazy_fixture("FakeFCIFileHandlerFDHSIQ4_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIIQTI_fixture")),
(lazy_fixture("FakeFCIFileHandlerFDHSIOtherCoverage_fixture")),
(lazy_fixture("FakeFCIFileHandlerHRFIOtherCoverage_fixture"))
])
def test_excs(self, reader_configs, fh_param):
"""Test that exceptions are raised where expected."""
Expand Down
Loading