cloudnetpy 1.95.3__tar.gz → 1.95.4__tar.gz

{cloudnetpy-1.95.3/cloudnetpy.egg-info → cloudnetpy-1.95.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.95.3
+Version: 1.95.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.95.3 → cloudnetpy-1.95.4}/cloudnetpy/categorize/model.py

@@ -71,10 +71,12 @@ class Model(DataSource):
             for ind, (alt, prof) in enumerate(
                 zip(self.model_heights, data_in, strict=True),
             ):
-                if prof.mask.all():
+                # Use only valid levels so that fill values don't leak in
+                valid = ~ma.getmaskarray(prof)
+                if np.count_nonzero(valid) < 2:
                     datai[ind, :] = ma.masked
                 else:
-                    fun = interp1d(alt, prof, fill_value="extrapolate")
+                    fun = interp1d(alt[valid], prof[valid], fill_value="extrapolate")
                     datai[ind, :] = fun(self.mean_height)
             return CloudnetArray(datai, key, units)
 

{cloudnetpy-1.95.3 → cloudnetpy-1.95.4}/cloudnetpy/instruments/nc_radar.py

@@ -213,16 +213,26 @@ class ChilboltonRadar(NcRadar):
 
 
 def estimate_snr_limit(
-    snr: ma.MaskedArray, n_gates: int = 50, percentile: float = 99.99
+    snr: ma.MaskedArray,
+    n_gates: int = 50,
+    percentile: float = 99.99,
+    max_sigma: float = 8,
 ) -> np.ndarray:
     """Estimates per-profile SNR threshold from noise in the top range gates.
 
     The noise level of each profile is the median SNR of its top gates. The
     margin above it is the given percentile of the noise scatter around the
-    level, pooled over all profiles.
+    level, pooled over all profiles, but at most `max_sigma` times the robust
+    (median absolute deviation) scatter so that signal in the top gates does
+    not inflate it.
     """
     top = snr[:, -n_gates:]
     noise_level = ma.median(top, axis=1)
     residual = (top - noise_level[:, np.newaxis]).compressed()
-    margin = np.percentile(residual, percentile) if residual.size else 0
+    if residual.size:
+        margin = np.percentile(residual, percentile)
+        sigma = 1.4826 * np.median(np.abs(residual))
+        margin = min(margin, max_sigma * sigma)
+    else:
+        margin = 0
     return ma.filled(noise_level + margin, fill_value=np.inf)

{cloudnetpy-1.95.3 → cloudnetpy-1.95.4}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 95
-PATCH = 3
+PATCH = 4
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.95.3 → cloudnetpy-1.95.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.95.3
+Version: 1.95.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License