Merge pull request #231 from adybbroe/fix-rsr-filename-mersi3-fy3f

Updated the file name for the FY-3F Mersi-3 RSRs
pytroll · Jul 17, 2024 · 24fb83c · 24fb83c
2 parents 3d044ec + 29663bc
commit 24fb83c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pyspectral/rsr_reader.py b/pyspectral/rsr_reader.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2014-2022 Pytroll developers
+# Copyright (c) 2014-2024 Pytroll developers
 #
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/pyspectral/utils.py b/pyspectral/utils.py
@@ -105,10 +105,10 @@
                                      'avhrr-2': 'avhrr/2',
                                      'avhrr-3': 'avhrr/3'}
 
-HTTP_PYSPECTRAL_RSR = "https://zenodo.org/records/12742887/files/pyspectral_rsr_data.tgz"
+HTTP_PYSPECTRAL_RSR = "https://zenodo.org/records/12743289/files/pyspectral_rsr_data.tgz"
 
 RSR_DATA_VERSION_FILENAME = "PYSPECTRAL_RSR_VERSION"
-RSR_DATA_VERSION = "v1.3.1"
+RSR_DATA_VERSION = "v1.3.2"
 
 ATM_CORRECTION_LUT_VERSION = {}
 ATM_CORRECTION_LUT_VERSION['antarctic_aerosol'] = {'version': 'v1.0.1',

diff --git a/rsr_convert_scripts/mersi3_rsr.py b/rsr_convert_scripts/mersi3_rsr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2018-2022 Pytroll developers
+# Copyright (c) 2018-2022, 2024 Pytroll developers
 #
 #
 # This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 import numpy as np
 
 from pyspectral.raw_reader import InstrumentRSR
-from pyspectral.utils import INSTRUMENTS
 from pyspectral.utils import convert2hdf5 as tohdf5
 
 LOG = logging.getLogger(__name__)
@@ -43,10 +42,10 @@ class Mersi3RSR(InstrumentRSR):
     """Container for the FY3D MERSI-II RSR data."""
 
     def __init__(self, bandname, platform_name):
-        """Initialize the MERSI-2 RSR class."""
+        """Initialize the MERSI-3 RSR class."""
         super(Mersi3RSR, self).__init__(bandname, platform_name, MERSI3_BAND_NAMES)
 
-        self.instrument = INSTRUMENTS.get(platform_name, 'mersi-3')
+        self.instrument = 'mersi3'
 
         self._get_options_from_config()
         self._get_bandfilenames()