Merge Arcticdem datamask to quality instead of validity mask

Fix falsy calculated arcticdem-buffer
awi-response · Nov 25, 2024 · 5ce1cde · 5ce1cde
1 parent c438bad
commit 5ce1cde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/darts-preprocessing/src/darts_preprocessing/preprocess.py b/darts-preprocessing/src/darts_preprocessing/preprocess.py
@@ -109,7 +109,8 @@ def preprocess_legacy_arcticdem_fast(
         ds_arcticdem = calculate_slope(ds_arcticdem)
 
     # Apply legacy scaling to tpi
-    ds_arcticdem["tpi"] = (ds_arcticdem.tpi + 50) * 300
+    with xr.set_options(keep_attrs=True):
+        ds_arcticdem["tpi"] = (ds_arcticdem.tpi + 50) * 300
     return ds_arcticdem
 
 
@@ -174,12 +175,9 @@ def preprocess_legacy_fast(
     ds_merged["slope"] = ds_arcticdem.slope
 
     # Update datamask with arcticdem mask
-    ds_merged["valid_data_mask"] = ds_data_masks.valid_data_mask * ds_arcticdem.datamask
-    ds_merged.valid_data_mask.attrs = {
-        "long_name": "Valid Data Mask",
-        "description": "A mask indicating where valid data is available.",
-        "data_source": "planet + arcticdem",
-    }
+    with xr.set_options(keep_attrs=True):
+        ds_merged["quality_data_mask"] = ds_data_masks.quality_data_mask * ds_arcticdem.datamask
+    ds_merged.quality_data_mask.attrs["data_source"] += " + ArcticDEM"
 
     tick_fend = time.perf_counter()
     logger.info(f"Preprocessing done in {tick_fend - tick_fstart:.2f} seconds.")

diff --git a/darts/src/darts/native.py b/darts/src/darts/native.py
@@ -1,7 +1,7 @@
 """Pipeline without any other framework."""
 
 import logging
-from math import ceil
+from math import ceil, sqrt
 from pathlib import Path
 from typing import Literal
 
@@ -276,7 +276,7 @@ def run_native_planet_pipeline_fast(
         try:
             optical = load_planet_scene(fpath)
             arcticdem = load_arcticdem_tile(
-                optical.odc.geobox, arcticdem_dir, resolution=2, buffer=ceil(tpi_outer_radius / 2)
+                optical.odc.geobox, arcticdem_dir, resolution=2, buffer=ceil(tpi_outer_radius / 2 * sqrt(2))
             )
             tcvis = load_tcvis(optical.odc.geobox, tcvis_dir)
             data_masks = load_planet_masks(fpath)
@@ -523,7 +523,7 @@ def run_native_sentinel2_pipeline_fast(
 
             optical = load_s2_scene(fpath)
             arcticdem = load_arcticdem_tile(
-                optical.odc.geobox, arcticdem_dir, resolution=10, buffer=ceil(tpi_outer_radius / 10)
+                optical.odc.geobox, arcticdem_dir, resolution=10, buffer=ceil(tpi_outer_radius / 10 * sqrt(2))
             )
             tcvis = load_tcvis(optical.odc.geobox, tcvis_dir)
             data_masks = load_s2_masks(fpath, optical.odc.geobox)