cloudnetpy 1.66.10__tar.gz → 1.66.12__tar.gz

{cloudnetpy-1.66.10/cloudnetpy.egg-info → cloudnetpy-1.66.12}/PKG-INFO

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

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12}/cloudnetpy/categorize/categorize.py

@@ -215,6 +215,9 @@ def _save_cat(
     }
 
     file_type = "categorize"
+    if "liquid_prob" in cloudnet_arrays:
+        file_type += "-voodoo"
+
     with output.init_file(full_path, dims, cloudnet_arrays, uuid) as nc:
         uuid_out = nc.file_uuid
         nc.cloudnet_file_type = file_type

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12}/cloudnetpy/categorize/containers.py

@@ -4,7 +4,7 @@ import numpy as np
 from numpy import ma
 
 from cloudnetpy import utils
-from cloudnetpy.constants import MM_H_TO_M_S
+from cloudnetpy.constants import MM_H_TO_M_S, T0
 from cloudnetpy.products.product_tools import CategoryBits
 
 from .disdrometer import Disdrometer
@@ -89,7 +89,8 @@ class ClassData:
         rain_from_disdrometer = self._find_rain_from_disdrometer()
         ind = ~rain_from_disdrometer.mask
         is_rain[ind] = rain_from_disdrometer[ind]
-        return is_rain
+        is_positive_temp = self.tw[:, 0] > T0 + 5  # Filter snowfall
+        return is_rain & is_positive_temp
 
     def _find_rain_from_radar_echo(self) -> np.ndarray:
         first_gate_with_data = np.argmin(self.z.mask.all(axis=0))

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12}/cloudnetpy/output.py

@@ -425,7 +425,15 @@ def _get_dimensions(nc: netCDF4.Dataset, data: np.ndarray) -> tuple:
 
 
 def _get_identifier(short_id: str) -> str:
-    valid_ids = ("lwc", "iwc", "drizzle", "classification", "der", "ier")
+    valid_ids = (
+        "lwc",
+        "iwc",
+        "drizzle",
+        "classification",
+        "der",
+        "ier",
+        "classification-voodoo",
+    )
     if short_id not in valid_ids:
         msg = f"Invalid file identifier: {short_id}"
         raise ValueError(msg)

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12}/cloudnetpy/products/classification.py

@@ -55,8 +55,11 @@ def generate_classification(
         date = product_container.get_date()
         attributes = output.add_time_attribute(CLASSIFICATION_ATTRIBUTES, date)
         output.update_attributes(product_container.data, attributes)
+        file_type = "classification"
+        if "liquid_prob" in product_container.dataset.variables:
+            file_type += "-voodoo"
         return output.save_product_file(
-            "classification",
+            file_type,
             product_container,
             output_file,
             uuid,

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 66
-PATCH = 10
+PATCH = 12
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.66.10 → cloudnetpy-1.66.12/cloudnetpy.egg-info}/PKG-INFO

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