cloudnetpy 1.62.0__tar.gz → 1.63.0__tar.gz

{cloudnetpy-1.62.0/cloudnetpy.egg-info → cloudnetpy-1.63.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.62.0
+Version: 1.63.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.62.0 → cloudnetpy-1.63.0}/cloudnetpy/categorize/containers.py

@@ -74,13 +74,28 @@ class ClassData:
 
     def _find_rain_from_radar_echo(self) -> np.ndarray:
         gate_number = 3
-        threshold = 0
+        threshold = {"z": 3, "v": 0, "ldr": -15}
         z = self.z[:, gate_number]
-        return np.where((~ma.getmaskarray(z)) & (z > threshold), 1, 0)
+        v = self.v[:, gate_number]
+        if hasattr(self, "ldr"):
+            ldr = self.ldr[:, gate_number]
+        elif hasattr(self, "sldr"):
+            ldr = self.sldr[:, gate_number]
+        else:
+            ldr = np.full(self.time.shape, threshold["ldr"] - 1)
+
+        return np.where(
+            (~ma.getmaskarray(z))
+            & (z > threshold["z"])
+            & (v < threshold["v"])
+            & (ldr < threshold["ldr"]),
+            1,
+            0,
+        )
 
     def _find_rain_from_disdrometer(self) -> ma.MaskedArray:
         threshold_mm_h = 0.25  # Standard threshold for drizzle -> rain
-        threshold_particles = 10  # This is arbitrary and should be better tested
+        threshold_particles = 30  # This is arbitrary and should be better tested
         threshold_rate = threshold_mm_h * MM_H_TO_M_S
         try:
             rainfall_rate = self.data["disdrometer"].data["rainfall_rate"].data

{cloudnetpy-1.62.0 → cloudnetpy-1.63.0}/cloudnetpy/categorize/insects.py

@@ -148,8 +148,7 @@ def _screen_insects(
         prob[(above_liquid == 1) & (insect_prob_no_ldr > 0)] = 0
 
     def _screen_rainy_profiles() -> None:
-        rain_smoothed = _smooth_rain(obs.time, obs.is_rain)
-        prob[rain_smoothed == 1, :] = 0
+        prob[obs.is_rain == 1, :] = 0
 
     prob = np.copy(insect_prob)
     _screen_liquid_layers()
@@ -157,15 +156,3 @@ def _screen_insects(
     _screen_above_liquid()
     _screen_rainy_profiles()
     return prob
-
-
-def _smooth_rain(time: np.ndarray, is_rain: np.ndarray) -> np.ndarray:
-    is_rain_smoothed = np.copy(is_rain)
-    time_buffer = 5  # minutes
-    n_profiles = len(is_rain)
-    n_steps = utils.n_elements(time, time_buffer, "time")
-    for rain_idx in np.where(is_rain)[0]:
-        idx_start = max(0, rain_idx - n_steps)
-        idx_end = min(rain_idx + n_steps, n_profiles)
-        is_rain_smoothed[idx_start : idx_end + 1] = True
-    return is_rain_smoothed

{cloudnetpy-1.62.0 → cloudnetpy-1.63.0}/cloudnetpy/instruments/weather_station.py

@@ -288,9 +288,12 @@ class GranadaWS(WS):
                     continue
                 parsed = value
                 if keymap[key] != "time":
-                    parsed = float(value)
+                    try:
+                        parsed = float(value)
+                    except ValueError:
+                        parsed = math.nan
                 data[keymap[key]].append(parsed)
-        return data
+        return self.format_data(data)
 
 
 class KenttarovaWS(WS):

{cloudnetpy-1.62.0 → cloudnetpy-1.63.0}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 62
+MINOR = 63
 PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.62.0 → cloudnetpy-1.63.0/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.62.0
+Version: 1.63.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License