FIX: Fix Landsat L2 surface reflectance and temperature computation #99

FIX: Test thermal bands in CI
sertit · Jul 20, 2023 · 116fe4a · 116fe4a
1 parent 85549b8
commit 116fe4a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@
 
 - FIX: Minor fix in RasterioError handling when reading bands 
 - FIX: Fix Landsat L2 surface reflectance and temperature computation ([#99](https://github.com/sertit/eoreader/issues/99))
+- FIX: Test thermal bands in CI
 
 ## 0.20.2 (2023-06-22)
 

diff --git a/CI/SCRIPTS/test_satellites.py b/CI/SCRIPTS/test_satellites.py
@@ -28,6 +28,7 @@
     SHADOWS,
     SLOPE,
     SWIR_2,
+    TIR_1,
     VV,
     VV_DSPK,
     to_str,
@@ -67,7 +68,7 @@
     "MERIT_DEM.vrt",
 ]
 
-WRITE_ON_DISK = False
+WRITE_ON_DISK = True
 
 
 def set_dem(dem_path):
@@ -108,7 +109,7 @@ def _test_core_optical(pattern: str, dem_path=None, debug=False, **kwargs):
         pattern (str): Pattern of the satellite
         debug (bool): Debug option
     """
-    possible_bands = [RED, SWIR_2, HILLSHADE, CLOUDS]
+    possible_bands = [RED, SWIR_2, TIR_1, HILLSHADE, CLOUDS]
     _test_core(pattern, opt_path(), possible_bands, dem_path, debug, **kwargs)
 
 
@@ -318,9 +319,20 @@ def _test_core(
                 ci.assert_val(stack.dtype, np.float32, "dtype")
 
                 # Check attributes
-                ci.assert_val(
-                    stack.attrs["long_name"], " ".join(to_str(stack_bands)), "long_name"
-                )
+                try:
+                    ci.assert_val(
+                        stack.attrs["long_name"],
+                        " ".join(to_str(stack_bands)),
+                        "long_name",
+                    )
+                except AssertionError:
+                    # Just try the other way, it depends on the saved stack
+                    ci.assert_val(
+                        " ".join(stack.attrs["long_name"]),
+                        " ".join(to_str(stack_bands)),
+                        "long_name",
+                    )
+
                 ci.assert_val(
                     stack.attrs["constellation"],
                     prod._get_constellation().value,

diff --git a/eoreader/products/optical/landsat_product.py b/eoreader/products/optical/landsat_product.py
@@ -1205,8 +1205,8 @@ def _to_tb(
 
             band_arr = k2 / np.log(k1 / band_arr + 1)
         elif self.product_type == LandsatProductType.L2:
-            c_mul_str = "TEMPERATURE_MULT_BAND_ST_" + band_name
-            c_add_str = "TEMPERATURE_ADD_BAND_ST_" + band_name
+            c_mul_str = "TEMPERATURE_MULT_BAND_ST_B" + band_name
+            c_add_str = "TEMPERATURE_ADD_BAND_ST_B" + band_name
 
             # Get coeffs to convert DN to reflectance
             c_mul = mtd.findtext(f".//{c_mul_str}")
@@ -1216,11 +1216,11 @@ def _to_tb(
             try:
                 c_mul = float(c_mul)
             except ValueError:
-                c_mul = 149.0
+                c_mul = 0.00341802
             try:
                 c_add = float(c_add)
             except ValueError:
-                c_add = 0.00341802
+                c_add = 149.0
 
             # Compute the correct reflectance of the band and set no data to 0
             band_arr = c_mul * band_arr + c_add  # Already in float