cloudnetpy 1.95.5__tar.gz → 1.95.7__tar.gz

{cloudnetpy-1.95.5/cloudnetpy.egg-info → cloudnetpy-1.95.7}/PKG-INFO

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

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/categorize/classify.py

@@ -62,7 +62,9 @@ def classify_measurements(data: Observations) -> ClassificationResult:
 
     bits.melting = melting.find_melting_layer(obs)
     bits.freezing = freezing.find_freezing_region(obs, bits.melting)
-    liquid_from_lidar = droplet.find_liquid(obs)
+    # Vaisala CL51/CL61 have reliable near-range data, so allow lower liquid peaks
+    is_cl = any(model in obs.lidar_type.lower() for model in ("cl51", "cl61"))
+    liquid_from_lidar = droplet.find_liquid(obs, min_alt=70 if is_cl else 100)
     if obs.lv0_files is not None and len(obs.lv0_files) > 0:
         if "rpg-fmcw-94" not in obs.radar_type.lower():
             msg = "VoodooNet is only implemented for RPG-FMCW-94 radar."

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/categorize/containers.py

@@ -56,6 +56,7 @@ class ClassData:
         height (ndarray): 1D height vector (m).
         model_type (str): Model identifier.
         radar_type (str): Radar identifier.
+        lidar_type (str): Lidar identifier.
         is_rain (ndarray): 2D boolean array denoting rain.
         is_clutter (ndarray): 2D boolean array denoting clutter.
         altitude: site altitude.
@@ -76,6 +77,7 @@ class ClassData:
         self.tw = data.model.data["Tw"][:]
         self.model_type = data.model.source_type
         self.beta = data.lidar.data["beta"][:]
+        self.lidar_type = data.lidar.source
         self.lwp = (
             data.mwr.data["lwp"][:]
             if data.mwr is not None

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/cli.py

@@ -437,6 +437,8 @@ def _process_instrument_product(
             input_files = input_folder
         case ("mrr", _id):
             fun = instruments.mrr2nc
+        case ("weather-radar", _id):
+            fun = instruments.wr2nc
         case ("weather-station", _id):
             fun = instruments.ws2nc
         case (invalid_product_id, invalid_instrument_id):
@@ -770,6 +772,10 @@ def _plot(
     options = PlotParameters()
     if args.max_y is not None:
         options.max_y = args.max_y
+    if args.start_time is not None:
+        options.start_time = args.start_time
+    if args.stop_time is not None:
+        options.stop_time = args.stop_time
     try:
         generate_figure(
             filepath,
@@ -949,6 +955,18 @@ def main() -> None:
         help="Maximum y-axis value (km) in 2D time/height plots (default: 12)",
         default=None,
     )
+    parser.add_argument(
+        "--start-time",
+        type=float,
+        help="Start time in fractional hours since midnight UTC (default: 0)",
+        default=None,
+    )
+    parser.add_argument(
+        "--stop-time",
+        type=float,
+        help="Stop time in fractional hours since midnight UTC (default: 24)",
+        default=None,
+    )
     parser.add_argument(
         "-o",
         "--options",

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/instruments/arm_ceilo.py

@@ -112,6 +112,8 @@ class ArmCeilo(Ceilometer):
             self.data["time"] = np.array(nc["time"][:])
             calibration_factor = float(self.site_meta.get("calibration_factor", 1))
             backscatter = ma.masked_invalid(nc["backscatter"][:])
+            # Missing profiles are filled with int32 min without _FillValue
+            backscatter = ma.masked_less(backscatter, -1e6)
             self.data["beta_raw"] = backscatter * BACKSCATTER_SCALE * calibration_factor
             self.data["calibration_factor"] = calibration_factor
             self.data["zenith_angle"] = float(ma.median(nc["tilt_angle"][:]))

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/instruments/kazr.py

@@ -12,6 +12,7 @@ from uuid import UUID
 
 import netCDF4
 import numpy as np
+import numpy.typing as npt
 from numpy import ma
 
 from cloudnetpy import output, utils
@@ -363,7 +364,7 @@ class Kazr(CloudnetInstrument):
         zh_key = next(k for k, v in self.keymap.items() if v == "Zh")
         bias = getattr(nc[zh_key], "applied_bias_correction", None)
         if bias is not None:
-            self.offset_applied = round(float(bias), 2)
+            self.offset_applied = _parse_bias(bias)
         self.serial_number = getattr(nc, "serial_number", None) or None
         self.append_data(np.array(nc["range"][:], dtype=float), "range")
         self.append_data(0.0, "zenith_angle")
@@ -473,18 +474,29 @@ def _find_ldr_floor(
 def _ldr_scatter(
     excess: ma.MaskedArray, snr: ma.MaskedArray, valid: np.ndarray
 ) -> np.ndarray:
-    """Estimates noise scatter (std) of LDR around the floor per SNR bin."""
+    """Estimates noise scatter (std) of LDR around the floor per SNR bin.
+
+    Bins with too few samples near the floor (typically low SNR, where only
+    strongly depolarizing targets have a detectable cross-polar signal) take
+    the scatter of the nearest populated bin.
+    """
     edges = np.arange(-10, 60, 5.0)
-    scatter = np.full(excess.shape, np.inf)
     near_floor = valid & (np.abs(excess) < 3)
-    for lo, hi in pairwise(edges):
+    per_bin = np.full(len(edges) - 1, np.nan)
+    for i, (lo, hi) in enumerate(pairwise(edges)):
         in_bin = (snr >= lo) & (snr < hi)
         samples = excess[in_bin & near_floor].compressed()
         if samples.size < 100:
             continue
         mad = np.median(np.abs(samples - np.median(samples)))
-        scatter[in_bin] = 1.4826 * mad
-    return scatter
+        per_bin[i] = 1.4826 * mad
+    known = ~np.isnan(per_bin)
+    if not known.any():
+        return np.full(excess.shape, np.inf)
+    ind = np.arange(per_bin.size)
+    per_bin = np.interp(ind, ind[known], per_bin[known])
+    bin_ind = np.clip(np.digitize(ma.filled(snr, -np.inf), edges) - 1, 0, ind[-1])
+    return np.where(ma.getmaskarray(snr), np.inf, per_bin[bin_ind])
 
 
 def _parse_global_attribute(nc: netCDF4.Dataset, key: str) -> float | None:
@@ -545,3 +557,13 @@ ATTRIBUTES = {
     "zenith_angle": COMMON_ATTRIBUTES["zenith_angle"]._replace(dimensions=None),
     "nyquist_velocity": COMMON_ATTRIBUTES["nyquist_velocity"]._replace(dimensions=None),
 }
+
+
+def _parse_bias(bias: npt.ArrayLike) -> float | None:
+    """Parses ARM reflectivity bias attribute, which may be an empty array."""
+    values = np.atleast_1d(np.asarray(bias, dtype=float))
+    if len(values) == 0:
+        return None
+    if len(np.unique(values)) > 1:
+        logging.warning("Multiple bias corrections %s, using the first one", values)
+    return round(float(values[0]), 2)

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/plotting/plotting.py

@@ -54,6 +54,8 @@ class PlotParameters:
             plotted variable.
         minor_ticks: Whether to display minor ticks on the x-axis.
         plot_above_ground: Whether to plot above ground instead of above mean sea level.
+        start_time: Start time in fractional hours for time-axis limits.
+        stop_time: Stop time in fractional hours for time-axis limits.
 
     """
 
@@ -70,6 +72,8 @@ class PlotParameters:
     raise_on_empty: bool = False
     minor_ticks: bool = True
     plot_above_ground: bool = True
+    start_time: float | None = None
+    stop_time: float | None = None
 
 
 class Dimensions:
@@ -337,7 +341,11 @@ class SubPlot:
         if self.options.minor_ticks:
             self.ax.xaxis.set_minor_locator(AutoMinorLocator(4))
             self.ax.tick_params(which="minor", length=2.5)
-        self.ax.set_xlim(0, 24)
+        start_time = (
+            self.options.start_time if self.options.start_time is not None else 0
+        )
+        stop_time = self.options.stop_time if self.options.stop_time is not None else 24
+        self.ax.set_xlim(start_time, stop_time)
 
     def set_yax(
         self,

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7}/cloudnetpy/version.py

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

{cloudnetpy-1.95.5 → cloudnetpy-1.95.7/cloudnetpy.egg-info}/PKG-INFO

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