cloudnetpy 1.64.4__py3-none-any.whl → 1.65.0__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → cloudnetpy-1.65.0.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.65.0.dist-info}/RECORD

@@ -3,18 +3,18 @@ cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7
 cloudnetpy/concat_lib.py,sha256=8Ek059RMLAfbbXCkX90cgnhw_8ZpcDrxw1yPvwtuitU,9846
 cloudnetpy/constants.py,sha256=YVbi2porUnKIzO_PdGeH9pEO9gKa95vDcj6TBMSreoY,734
 cloudnetpy/datasource.py,sha256=j7N4g59HPvOBWle-W9bOUF0BfRLgvR4zwOi_B50cI7Q,7921
-cloudnetpy/exceptions.py,sha256=wrI0bZTwmS5C_cqOmvlJ8XJSEFyzuD1eD4voGJc_Gjg,1584
+cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
 cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YkCaxVkG_Mt2hng_IVnhygHteV4UMKzKALkeFZwFJL8,14822
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JV0Fawnme1HoZgoiidV3eIzsn6vx0AEjBNmI1CcrBsA,28517
-cloudnetpy/version.py,sha256=i_Co9w-oOI_xRZZ9bnCQKB0KyueIqMaA3uFL0Llm6LY,72
+cloudnetpy/version.py,sha256=GyQ5dtQt1vQ9KfpnsA6Fw5Z-nvlfzCZj7jSg1WwwuhY,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
-cloudnetpy/categorize/atmos.py,sha256=G4DmEJCt1FAPYyt7oXzBH47JTeb5lUOGDakkviOXblE,12390
+cloudnetpy/categorize/atmos.py,sha256=vavMC_WQQyGH14eL4vAzKLKDDZt8tBrMYimztYHOjH8,12639
 cloudnetpy/categorize/atmos_utils.py,sha256=64uenj2uxj3P3Blaq_pBN1pBjcF-X4LYNt-uTOjvevg,3778
-cloudnetpy/categorize/categorize.py,sha256=owM4ebqJCHnCWHDMELv6Qa8zM_7qKcBpzJOfPva1Py0,17929
+cloudnetpy/categorize/categorize.py,sha256=WQobVBcCk0HbbSIVm9yNX5apwj-5S6IIX4dvleaji0Y,18070
 cloudnetpy/categorize/classify.py,sha256=a-0bVCtynGfORnDGTsPuzqkuDeOOR_OMz5ai9NsMuic,9870
-cloudnetpy/categorize/containers.py,sha256=L4UaihDfeMCADZiKdII5NCP49ZNlodCoM9X3yxEfJ_A,4748
+cloudnetpy/categorize/containers.py,sha256=g3SQHoqlY1uJ8b-MG-BbW3oWz5IyacA8kJBeIPy_4EA,4859
 cloudnetpy/categorize/disdrometer.py,sha256=keU3pFvKtk840A0oLwAyNDuqOCswBPJEKf2bV0YWyA8,2004
 cloudnetpy/categorize/droplet.py,sha256=894VHdL9ScaB8f1oxXwM2la4ShXd-uWywQDINoaoiD8,8687
 cloudnetpy/categorize/falling.py,sha256=Wz49mbw0pubnbhoekYTqGT0S9UNaE88jWOjSPEsCIaI,4386
@@ -23,8 +23,8 @@ cloudnetpy/categorize/insects.py,sha256=9J5agmktit8Or66GGNue-bThiaG9rB2SuPNZBXI7
 cloudnetpy/categorize/lidar.py,sha256=YQrM_LOz8NQrrD9l9HyujV1GSGwkQ8LMqXN13bEJRW4,2605
 cloudnetpy/categorize/melting.py,sha256=mYdOKxfTC2InB8NdOPwr_7NpbouQMm-9f2Q1kfTqIJE,6262
 cloudnetpy/categorize/model.py,sha256=rLyx9SKz56BmQ809PwwhCnbusshUuYPoqhLJbnZvrt8,5842
-cloudnetpy/categorize/mwr.py,sha256=rTyVYaMotXl7LRgRQBBcrLInsrWGl4sFdZ4pyM4jXMc,1436
-cloudnetpy/categorize/radar.py,sha256=C4R74E_jmLOJqXLrfhdrAitHRHHA79UYuChz9VLxy58,13722
+cloudnetpy/categorize/mwr.py,sha256=F7cquERWL6mBkgboqeaCIPf9gOlKI-NWUQIBdQXGT_I,1635
+cloudnetpy/categorize/radar.py,sha256=NCBjyC-OvkcprDnaDD0ql3WoKtSWMHcMhspTh5Zlmi8,13730
 cloudnetpy/instruments/__init__.py,sha256=_jejVwi_viSZehmAOkEqTNI-0-exGgAJ_bHW1IRRwTI,398
 cloudnetpy/instruments/basta.py,sha256=_OTnySd36ktvxk_swWBzbv_H4AVGlkF_Ce3KtPGD1rE,3758
 cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3Dn0WbvoAppFOMbA8,5270
@@ -97,19 +97,19 @@ cloudnetpy/plotting/plot_meta.py,sha256=JHrr-4A9fhqdi_tQFe6mR4Fdry3hkI-lmmVu5Ny2
 cloudnetpy/plotting/plotting.py,sha256=rVaCsXTrhb0ahdXerSPLZWRASs_QktyLUbjyHoVuam8,33584
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=bNG8W1CMgGoUBpXopQjYAW3F-uEJGyojXb4A5jmErHo,7921
-cloudnetpy/products/der.py,sha256=sITzQbvutU5u1D16hDG2Ke7XB9gBxSP22OLy2Yhi1zI,12446
+cloudnetpy/products/der.py,sha256=1LDBbnbUg8feMUTGWJq3bObBhEcZ_Ee17MB1x0GwRdo,12669
 cloudnetpy/products/drizzle.py,sha256=58C9Mo6oRXR8KpbVPghbJvHvFX9GfS3xUp058pbf0qw,10804
 cloudnetpy/products/drizzle_error.py,sha256=4GwlHRtNbk9ks7bGtXCco-wXbcDOKeAQwKmbhzut6Qk,6132
 cloudnetpy/products/drizzle_tools.py,sha256=LR2AtbFQRGFrJ2LGyiLxOfbnlznVLydXvb8RFDR0_4E,10848
 cloudnetpy/products/ier.py,sha256=ge1f_aYick20Nlznq8zbBl5umWlTP-UwMivy4Y05Sck,7839
 cloudnetpy/products/iwc.py,sha256=Q8dXV3JF3JUQgwkmQFOKakm21Tnf8oCWsH0CSqIEKl4,10209
-cloudnetpy/products/lwc.py,sha256=LsqEPluRW1JmFnM8GiQHfciBR6q5CXjr8D-D2qcGQeM,18774
+cloudnetpy/products/lwc.py,sha256=wSd3GDqELz4yyWBMiKDR-QhRK8scPheqsBcS1qzxYOI,18997
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=3esU5cG5GI2WVmOENqrJ0FbMuxLegADv7q8TB0RorGg,4674
 cloudnetpy/products/product_tools.py,sha256=VNw2diJj30POz68-3qNVkJP7r9AUspT_d1Fp0BbeIx8,10414
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.64.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.64.4.dist-info/METADATA,sha256=f_OMmWbN7kTFNYGnHhZuyoC2mqK3A_lZjojPxVYyrYc,5784
-cloudnetpy-1.64.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-cloudnetpy-1.64.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.64.4.dist-info/RECORD,,
+cloudnetpy-1.65.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.65.0.dist-info/METADATA,sha256=MRy1c5jmGmBs67KS3mr2jWmkiuvmhMWh1zfdr8YZj58,5784
+cloudnetpy-1.65.0.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+cloudnetpy-1.65.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.65.0.dist-info/RECORD,,

{cloudnetpy-1.64.4.dist-info → cloudnetpy-1.65.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (73.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any