Commit abbc5793 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed wrong values for LBA_sorted for Landsat-7 and Landsat-8, SPOT-1-5 (wrong...


Fixed wrong values for LBA_sorted for Landsat-7 and Landsat-8, SPOT-1-5 (wrong PAN position). Added TestRelativeSpectralResponse.sort_by_cwl(). Updated HISTORY.rst and bumped version.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent e7d198ea
Pipeline #16142 passed with stages
in 33 seconds
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
History History
======= =======
0.4.1 (2020-11-28)
------------------
* Fixed wrong values for LBA_sorted for Landsat-7 and Landsat-8, SPOT-1-5 (wrong PAN position).
* Added TestRelativeSpectralResponse.sort_by_cwl().
0.4.0 (2020-11-10) 0.4.0 (2020-11-10)
------------------ ------------------
......
...@@ -100,7 +100,7 @@ sensors = { ...@@ -100,7 +100,7 @@ sensors = {
'satellite': 'Landsat-8', 'satellite': 'Landsat-8',
'sensor': 'LDCM', 'sensor': 'LDCM',
'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'], 'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'],
'LBA_sorted': ['1', '2', '3', '4', '5', '9', '6', '7', '8', '10', '11'], 'LBA_sorted': ['1', '2', '3', '8', '4', '5', '9', '6', '7', '10', '11'],
'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'], 'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'],
'pan': ['8'], 'pan': ['8'],
'thermal': ['10', '11'] 'thermal': ['10', '11']
...@@ -110,7 +110,7 @@ sensors = { ...@@ -110,7 +110,7 @@ sensors = {
'satellite': 'Landsat-8', 'satellite': 'Landsat-8',
'sensor': 'OLI_TIRS', 'sensor': 'OLI_TIRS',
'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'], 'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'],
'LBA_sorted': ['1', '2', '3', '4', '5', '9', '6', '7', '8', '10', '11'], 'LBA_sorted': ['1', '2', '3', '8', '4', '5', '9', '6', '7', '10', '11'],
'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'], 'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'],
'pan': ['8'], 'pan': ['8'],
'thermal': ['10', '11'] 'thermal': ['10', '11']
...@@ -120,7 +120,7 @@ sensors = { ...@@ -120,7 +120,7 @@ sensors = {
'satellite': 'Landsat-8', 'satellite': 'Landsat-8',
'sensor': 'OLI', 'sensor': 'OLI',
'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9'], 'LBA': ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
'LBA_sorted': ['1', '2', '3', '4', '5', '9', '6', '7', '8'], 'LBA_sorted': ['1', '2', '3', '8', '4', '5', '9', '6', '7'],
'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'], 'LBA_after_AC': ['1', '2', '3', '4', '5', '6', '7'],
'pan': ['8'] 'pan': ['8']
}, },
...@@ -136,6 +136,7 @@ sensors = { ...@@ -136,6 +136,7 @@ sensors = {
'satellite': 'SPOT-1', 'satellite': 'SPOT-1',
'sensor': 'HRV1', 'sensor': 'HRV1',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -143,6 +144,7 @@ sensors = { ...@@ -143,6 +144,7 @@ sensors = {
'satellite': 'SPOT-2', 'satellite': 'SPOT-2',
'sensor': 'HRV1', 'sensor': 'HRV1',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -150,6 +152,7 @@ sensors = { ...@@ -150,6 +152,7 @@ sensors = {
'satellite': 'SPOT-3', 'satellite': 'SPOT-3',
'sensor': 'HRV1', 'sensor': 'HRV1',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -157,6 +160,7 @@ sensors = { ...@@ -157,6 +160,7 @@ sensors = {
'satellite': 'SPOT-4', 'satellite': 'SPOT-4',
'sensor': 'HRVIR1', 'sensor': 'HRVIR1',
'LBA': ['1', '2', '3', '4', '5'], 'LBA': ['1', '2', '3', '4', '5'],
'LBA_sorted': ['1', '5', '2', '3', '4'], # TODO re-check that when issue #8 is fixed
'pan': ['5'] 'pan': ['5']
}, },
...@@ -164,6 +168,7 @@ sensors = { ...@@ -164,6 +168,7 @@ sensors = {
'satellite': 'SPOT-5', 'satellite': 'SPOT-5',
'sensor': 'HRG1', 'sensor': 'HRG1',
'LBA': ['1', '2', '3', '4', '5'], 'LBA': ['1', '2', '3', '4', '5'],
'LBA_sorted': ['1', '5', '2', '3', '4'],
'pan': ['5'] 'pan': ['5']
}, },
...@@ -171,6 +176,7 @@ sensors = { ...@@ -171,6 +176,7 @@ sensors = {
'satellite': 'SPOT-1', 'satellite': 'SPOT-1',
'sensor': 'HRV2', 'sensor': 'HRV2',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -178,6 +184,7 @@ sensors = { ...@@ -178,6 +184,7 @@ sensors = {
'satellite': 'SPOT-2', 'satellite': 'SPOT-2',
'sensor': 'HRV2', 'sensor': 'HRV2',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -185,6 +192,7 @@ sensors = { ...@@ -185,6 +192,7 @@ sensors = {
'satellite': 'SPOT-3', 'satellite': 'SPOT-3',
'sensor': 'HRV2', 'sensor': 'HRV2',
'LBA': ['1', '2', '3', '4'], 'LBA': ['1', '2', '3', '4'],
'LBA_sorted': ['1', '4', '2', '3'],
'pan': ['4'], 'pan': ['4'],
}, },
...@@ -192,6 +200,7 @@ sensors = { ...@@ -192,6 +200,7 @@ sensors = {
'satellite': 'SPOT-4', 'satellite': 'SPOT-4',
'sensor': 'HRVIR2', 'sensor': 'HRVIR2',
'LBA': ['1', '2', '3', '4', '5'], 'LBA': ['1', '2', '3', '4', '5'],
'LBA_sorted': ['1', '5', '2', '3', '4'], # TODO re-check that when issue #8 is fixed
'pan': ['5'] 'pan': ['5']
}, },
...@@ -199,6 +208,7 @@ sensors = { ...@@ -199,6 +208,7 @@ sensors = {
'satellite': 'SPOT-5', 'satellite': 'SPOT-5',
'sensor': 'HRG2', 'sensor': 'HRG2',
'LBA': ['1', '2', '3', '4', '5'], 'LBA': ['1', '2', '3', '4', '5'],
'LBA_sorted': ['1', '5', '2', '3', '4'],
'pan': ['5'] 'pan': ['5']
}, },
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.4.0' __version__ = '0.4.1'
__versionalias__ = '20201110.01' __versionalias__ = '20201128.01'
...@@ -92,6 +92,12 @@ class TestRelativeSpectralResponse(unittest.TestCase): ...@@ -92,6 +92,12 @@ class TestRelativeSpectralResponse(unittest.TestCase):
self.assertEqual(len(RSR.wvl), 7) self.assertEqual(len(RSR.wvl), 7)
def test_sort_by_cwl(self):
RSR = RelativeSpectralResponse(satellite='Landsat-7', sensor='ETM+',
sort_by_cwl=True, no_pan=False)
self.assertEqual(list(sorted(RSR.wvl.tolist())), RSR.wvl.tolist())
class Test_get_LayerBandsAssignment(unittest.TestCase): class Test_get_LayerBandsAssignment(unittest.TestCase):
def test_fullLBA(self): def test_fullLBA(self):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment