cloudnetpy 1.64.4__tar.gz → 1.65.0__tar.gz

{cloudnetpy-1.64.4/cloudnetpy.egg-info → cloudnetpy-1.65.0}/PKG-INFO

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

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/categorize/atmos.py

@@ -181,7 +181,14 @@ class LiquidAttenuation(Attenuation):
 
     def __init__(self, data: dict, classification: ClassificationResult):
         super().__init__(data["model"], classification)
-        self._mwr = data["mwr"].data
+        if data["mwr"] is not None:
+            self._mwr = data["mwr"].data
+        else:
+            n_time = data["radar"].data["Z"][:].shape[0]
+            self._mwr = {
+                "lwp": ma.masked_all(n_time),
+                "lwp_error": ma.masked_all(n_time),
+            }
         self._lwc_dz_err = self._get_lwc_change_rate_error()
         self.atten = self._get_liquid_atten()
         self.atten_err = self._get_liquid_atten_err()

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/categorize/categorize.py

@@ -65,9 +65,10 @@ def generate_categorize(
 
     def _interpolate_to_cloudnet_grid() -> list:
         wl_band = utils.get_wl_band(data["radar"].radar_frequency)
-        data["mwr"].rebin_to_grid(time)
         if data["disdrometer"] is not None:
             data["disdrometer"].interpolate_to_grid(time)
+        if data["mwr"] is not None:
+            data["mwr"].rebin_to_grid(time)
         data["model"].interpolate_to_common_height(wl_band)
         model_gap_ind = data["model"].interpolate_to_grid(time, height)
         radar_gap_ind = data["radar"].rebin_to_grid(time)
@@ -115,7 +116,7 @@ def generate_categorize(
             **data["lidar"].data,
             **data["model"].data,
             **data["model"].data_sparse,
-            **data["mwr"].data,
+            **(data["mwr"].data if data["mwr"] is not None else {}),
             **(data["disdrometer"].data if data["disdrometer"] is not None else {}),
         }
 
@@ -131,10 +132,12 @@ def generate_categorize(
         data: dict = {
             "radar": Radar(input_files["radar"]),
             "lidar": Lidar(input_files["lidar"]),
-            "mwr": Mwr(input_files["mwr"]),
             "lv0_files": input_files.get("lv0_files"),
+            "mwr": None,
             "disdrometer": None,
         }
+        if "mwr" in input_files:
+            data["mwr"] = Mwr(input_files["mwr"])
         if "disdrometer" in input_files:
             try:
                 data["disdrometer"] = Disdrometer(input_files["disdrometer"])

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/categorize/containers.py

@@ -58,7 +58,11 @@ class ClassData:
         self.tw = data["model"].data["Tw"][:]
         self.model_type = data["model"].source_type
         self.beta = data["lidar"].data["beta"][:]
-        self.lwp = data["mwr"].data["lwp"][:]
+        self.lwp = (
+            data["mwr"].data["lwp"][:]
+            if data["mwr"] is not None
+            else ma.masked_all(self.time.shape)
+        )
         self.is_rain = self._find_profiles_with_rain()
         self.is_clutter = _find_clutter(self.v, self.is_rain)
         self.altitude = data["radar"].altitude

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/categorize/mwr.py

@@ -1,6 +1,7 @@
 """Mwr module, containing the :class:`Mwr` class."""
 
 import numpy as np
+import numpy.ma as ma
 
 from cloudnetpy import utils
 from cloudnetpy.constants import G_TO_KG
@@ -32,6 +33,9 @@ class Mwr(DataSource):
 
     def _init_lwp_data(self) -> None:
         lwp = self.dataset.variables["lwp"][:]
+        if "lwp_quality_flag" in self.dataset.variables:
+            quality_flag = self.dataset.variables["lwp_quality_flag"][:]
+            lwp[quality_flag != 0] = ma.masked
         self.append_data(lwp, "lwp")
 
     def _init_lwp_error(self) -> None:

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/categorize/radar.py

@@ -257,7 +257,7 @@ class Radar(DataSource):
             noise_threshold = 3
             n_pulses = _number_of_independent_pulses()
             ln_to_log10 = 10 / np.log(10)
-            z_precision = (ln_to_log10 / np.sqrt(n_pulses)) * (
+            z_precision = ma.divide(ln_to_log10, np.sqrt(n_pulses)) * (
                 1 + (utils.db2lin(z_power_min - z_power) / noise_threshold)
             )
             gas_error = attenuations["radar_gas_atten"] * 0.1

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/exceptions.py

@@ -63,3 +63,10 @@ class HatproDataError(CloudnetException):
 
     def __init__(self, msg: str = "Invalid HATPRO file"):
         super().__init__(msg)
+
+
+class InvalidSourceFileError(CloudnetException):
+    """Internal exception class."""
+
+    def __init__(self, msg: str = "Invalid source file"):
+        super().__init__(msg)

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/products/der.py

@@ -10,6 +10,7 @@ from numpy import ma
 from cloudnetpy import output, utils
 from cloudnetpy.categorize import atmos
 from cloudnetpy.datasource import DataSource
+from cloudnetpy.exceptions import InvalidSourceFileError
 from cloudnetpy.metadata import MetaData
 from cloudnetpy.products.product_tools import (
     CategorizeBits,
@@ -113,6 +114,9 @@ class DerSource(DataSource):
 
     def __init__(self, categorize_file: str, parameters: Parameters | None = None):
         super().__init__(categorize_file)
+        if "lwp" not in self.dataset.variables:
+            msg = "Liquid water path missing from the categorize file."
+            raise InvalidSourceFileError(msg)
         self.is_rain = get_is_rain(categorize_file)
         self.categorize_bits = CategorizeBits(categorize_file)
         if parameters is None:

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/products/lwc.py

@@ -8,6 +8,7 @@ from numpy import ma
 from cloudnetpy import output, utils
 from cloudnetpy.categorize import atmos
 from cloudnetpy.datasource import DataSource
+from cloudnetpy.exceptions import InvalidSourceFileError
 from cloudnetpy.metadata import MetaData
 from cloudnetpy.products import product_tools as p_tools
 from cloudnetpy.products.product_tools import CategorizeBits, get_is_rain
@@ -88,6 +89,9 @@ class LwcSource(DataSource):
 
     def __init__(self, categorize_file: str):
         super().__init__(categorize_file)
+        if "lwp" not in self.dataset.variables:
+            msg = "Liquid water path missing from the categorize file."
+            raise InvalidSourceFileError(msg)
         self.lwp = self.getvar("lwp")
         self.lwp[self.lwp < 0] = 0
         self.lwp_error = self.getvar("lwp_error")

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0}/cloudnetpy/version.py

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

{cloudnetpy-1.64.4 → cloudnetpy-1.65.0/cloudnetpy.egg-info}/PKG-INFO

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