Platform specific nt gradient thresholds

pm_icecon/bt/xfer_tbs.py

@@ -14,7 +14,7 @@
 # RSS-specific Tb transformation values
 # Each key is a platform name. This mapps to another dictionary of Tb channel
 # names w/ maps to a tuple representing a slope and offset.
-rss_tb_xfers = dict(
+rss_tb_xfers: dict[str, dict[str, tuple[float, float]]] = dict(
     n07=dict(
         v37=(0.97901150, 6.6694386),
         h37=(1.0065762, 4.6935520),

pm_icecon/nt/params/amsr2.py

@@ -5,10 +5,7 @@
 from pm_tb_data._types import Hemisphere
 
 from pm_icecon.nt._types import NasateamGradientRatioThresholds
-from pm_icecon.nt.params.goddard_rss import (
-    RSS_F17_NORTH_GRADIENT_THRESHOLDS,
-    RSS_F17_SOUTH_GRADIENT_THRESHOLDS,
-)
+from pm_icecon.nt.params.gradient_thresholds import get_cdr_rss_thresholds
 from pm_icecon.nt.tiepoints import NasateamTiePoints, get_tiepoints
 
 
@@ -26,12 +23,10 @@ def get_amsr2_params(
     nt_tiepoints = get_tiepoints(satellite="u2", hemisphere=hemisphere)
 
     # Gradient thresholds
-    nt_gradient_thresholds = (
-        RSS_F17_NORTH_GRADIENT_THRESHOLDS
-        if hemisphere == "north"
-        else RSS_F17_SOUTH_GRADIENT_THRESHOLDS
+    nt_gradient_thresholds = get_cdr_rss_thresholds(
+        hemisphere=hemisphere, platform="f17"
     )
-    logger.info("NT gradient threshold values for AMSR2 are copied from f17_final")
+    logger.info("NT gradient threshold values for AMSR2 are copied from f17")
 
     return NasateamParams(
         tiepoints=nt_tiepoints,

pm_icecon/nt/params/gradient_thresholds.py

@@ -0,0 +1,101 @@
+"""Gradient thresholds for the nasateam weather filter.
+"""
+from pm_tb_data._types import NORTH, SOUTH
+
+from pm_icecon.nt._types import NasateamGradientRatioThresholds
+from pm_icecon.errors import UnexpectedSatelliteError
+
+# These thresholds defined specifically for the CDR. These differ from thoes
+# defined by Goddard.
+# RSS is Remote Sensing Systems. Data from RSS is used for the Final CDR
+# (g02202)
+CDR_RSS_THRESHOLDS_NORTH = dict(
+    f17=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    f13=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    f11=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    f08=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    n07=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.07,
+            # This value ensures the threshold is never met for SMMR.
+            # TODO: Better way to express this? `None`?
+            "2219": 9999.9,
+        }
+    ),
+)
+
+CDR_RSS_THRESHOLDS_SOUTH = dict(
+    f17=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.057,
+            "2219": 0.045,
+        }
+    ),
+    f13=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    f11=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    f08=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.050,
+            "2219": 0.045,
+        }
+    ),
+    n07=NasateamGradientRatioThresholds(
+        {
+            "3719": 0.076,
+            # This value ensures the threshold is never met for SMMR.
+            # TODO: Better way to express this? `None`?
+            "2219": 9999.9,
+        }
+    ),
+)
+
+
+def get_cdr_rss_thresholds(
+    *, hemisphere, platform: str
+) -> NasateamGradientRatioThresholds:
+    """Get Gradient thresholds for the CDR.
+
+    Note that goddard specific thresholds are defined and used in the `test_nt`
+    regression test file.
+    """
+    rss_thresholds = {
+        NORTH: CDR_RSS_THRESHOLDS_NORTH,
+        SOUTH: CDR_RSS_THRESHOLDS_SOUTH,
+    }[hemisphere]
+    if platform not in rss_thresholds.keys():
+        raise UnexpectedSatelliteError(
+            f"No {hemisphere[0].upper()}H thresholds defined for {platform=}."
+        )
+    platform = platform.lower()
+
+    return rss_thresholds[platform]

pm_icecon/nt/params/nsidc0001.py

@@ -1,13 +1,9 @@
 """Parameters for use with NSIDC-0001 data."""
 
-from loguru import logger
 from pm_tb_data._types import Hemisphere
 from pm_icecon._types import ValidSatellites
 
-from pm_icecon.nt.params.goddard_rss import (
-    RSS_F17_NORTH_GRADIENT_THRESHOLDS,
-    RSS_F17_SOUTH_GRADIENT_THRESHOLDS,
-)
+from pm_icecon.nt.params.gradient_thresholds import get_cdr_rss_thresholds
 from pm_icecon.nt.tiepoints import get_tiepoints
 from pm_icecon.nt.params.amsr2 import NasateamParams
 
@@ -20,12 +16,9 @@ def get_0001_nt_params(
     nt_tiepoints = get_tiepoints(satellite=platform, hemisphere=hemisphere)
 
     # Gradient thresholds
-    nt_gradient_thresholds = (
-        RSS_F17_NORTH_GRADIENT_THRESHOLDS
-        if hemisphere == "north"
-        else RSS_F17_SOUTH_GRADIENT_THRESHOLDS
+    nt_gradient_thresholds = get_cdr_rss_thresholds(
+        hemisphere=hemisphere, platform=platform
     )
-    logger.info("NT gradient threshold values for {platform} are copied from f17_final")
 
     return NasateamParams(
         tiepoints=nt_tiepoints,

pm_icecon/tests/regression/test_nt.py

@@ -10,12 +10,25 @@
 from pm_icecon.tests.regression import CDR_TESTDATA_DIR
 from pm_icecon.interpolation import spatial_interp_tbs
 from pm_icecon.nt.compute_nt_ic import goddard_nasateam
-from pm_icecon.nt.params.goddard_rss import (
-    RSS_F17_NORTH_GRADIENT_THRESHOLDS,
-    RSS_F17_SOUTH_GRADIENT_THRESHOLDS,
-)
 from pm_icecon.nt.tiepoints import get_tiepoints
 from pm_icecon.util import get_ps25_grid_shape
+from pm_icecon.nt._types import NasateamGradientRatioThresholds
+
+
+RSS_GODDARD_F17_NORTH_GRADIENT_THRESHOLDS = NasateamGradientRatioThresholds(
+    {
+        "3719": 0.050,
+        "2219": 0.045,
+    }
+)
+
+
+RSS_GODDARD_F17_SOUTH_GRADIENT_THRESHOLDS = NasateamGradientRatioThresholds(
+    {
+        "3719": 0.053,
+        "2219": 0.045,
+    }
+)
 
 
 def _get_ps25_sst_mask(
@@ -110,9 +123,9 @@ def _get_minic(*, hemisphere: Hemisphere):
         minic=_get_minic(hemisphere=hemisphere),
         invalid_ice_mask=invalid_ice_mask,
         gradient_thresholds=(
-            RSS_F17_NORTH_GRADIENT_THRESHOLDS
+            RSS_GODDARD_F17_NORTH_GRADIENT_THRESHOLDS
             if hemisphere == "north"
-            else RSS_F17_SOUTH_GRADIENT_THRESHOLDS
+            else RSS_GODDARD_F17_SOUTH_GRADIENT_THRESHOLDS
         ),
         tiepoints=get_tiepoints(satellite="17_final", hemisphere=hemisphere),
     )