cloudnetpy 1.78.3__py3-none-any.whl → 1.79.0__py3-none-any.whl

cloudnetpy/exceptions.py

@@ -23,6 +23,13 @@ class RadarDataError(CloudnetException):
         super().__init__(msg)
 
 
+class LidarDataError(CloudnetException):
+    """Internal exception class."""
+
+    def __init__(self, msg: str):
+        super().__init__(msg)
+
+
 class PlottingError(CloudnetException):
     """Internal exception class."""
 

cloudnetpy/instruments/ceilo.py

@@ -117,11 +117,10 @@ def _get_n_negatives(ceilo_obj: ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135) ->
     is_old_chm_version = (
         hasattr(ceilo_obj, "is_old_version") and ceilo_obj.is_old_version
     )
-    is_ct25k = (
-        ceilo_obj.instrument is not None
-        and getattr(ceilo_obj.instrument, "model", "").lower() == "ct25k"
-    )
-    if is_old_chm_version or is_ct25k:
+    is_old_vaisala_model = ceilo_obj.instrument is not None and getattr(
+        ceilo_obj.instrument, "model", ""
+    ).lower() in ("ct25k", "cl31")
+    if is_old_chm_version or is_old_vaisala_model:
         return 20
     return 5
 

cloudnetpy/instruments/cl61d.py

@@ -4,6 +4,8 @@ import logging
 
 import netCDF4
 
+from cloudnetpy import utils
+from cloudnetpy.exceptions import LidarDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.nc_lidar import NcLidar
 
@@ -39,6 +41,9 @@ class Cl61d(NcLidar):
             msg = "No dataset found"
             raise RuntimeError(msg)
         beta_raw = self.dataset.variables["beta_att"][:]
+        if utils.is_all_masked(beta_raw):
+            msg = "All beta_raw values are masked. Check the input file(s)."
+            raise LidarDataError(msg)
         if calibration_factor is None:
             logging.warning("Using default calibration factor")
             calibration_factor = 1

cloudnetpy/instruments/disdrometer/thies.py

@@ -206,10 +206,11 @@ class Thies(Disdrometer):
         self.serial_number = first_id
 
     def _read_line(self, line: str, timestamp: datetime.datetime | None = None):
-        raw_values = line.split(";")
+        raw_values = line.strip().strip(";").split(";")
         # Support custom truncated format used in Leipzig LIM.
-        expected_columns = self.site_meta.get("truncate_columns", 521)
-        if len(raw_values) != expected_columns:
+        expected_columns = self.site_meta.get("truncate_columns", 521) - 1
+        # Length matches telegram 4 or 5 (has 4 additional columns).
+        if len(raw_values) not in (expected_columns, expected_columns + 4):
             return
         for i, key in TELEGRAM4:
             if i >= expected_columns - 1:
@@ -246,7 +247,7 @@ class Thies(Disdrometer):
             self.raw_data[key].append(value)
         if expected_columns > 79:
             self.raw_data["spectrum"].append(
-                np.array(list(map(int, raw_values[79:-2])), dtype="i2").reshape(
+                np.array(list(map(int, raw_values[79:519])), dtype="i2").reshape(
                     self.n_diameter, self.n_velocity
                 )
             )

cloudnetpy/utils.py

@@ -8,9 +8,9 @@ import re
 import textwrap
 import uuid
 import warnings
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from datetime import timezone
-from typing import Any, Literal, TypeVar
+from typing import Literal, TypeVar
 
 import netCDF4
 import numpy as np
@@ -139,11 +139,19 @@ def binvec(x: np.ndarray | list) -> np.ndarray:
     return np.linspace(edge1, edge2, len(x) + 1)
 
 
+REBIN_STAT = Literal["mean", "std", "max"]
+REBIN_STAT_FN: dict[REBIN_STAT, Callable] = {
+    "mean": ma.mean,
+    "std": ma.std,
+    "max": ma.max,
+}
+
+
 def rebin_2d(
     x_in: np.ndarray,
     array: np.ndarray,
     x_new: np.ndarray,
-    statistic: Literal["mean", "std", "max"] = "mean",
+    statistic: REBIN_STAT = "mean",
     n_min: int = 1,
     *,
     keepdim: bool = False,
@@ -154,11 +162,7 @@ def rebin_2d(
     n_bins = len(x_new)
     counts = np.bincount(binn[binn >= 0], minlength=n_bins)
 
-    stat_fn: Any = {
-        "mean": ma.mean,
-        "std": ma.std,
-        "max": ma.max,
-    }[statistic]
+    stat_fn = REBIN_STAT_FN[statistic]
 
     shape = array.shape if keepdim else (n_bins, array.shape[1])
     result: ma.MaskedArray = ma.masked_array(np.ones(shape, dtype="float32"), mask=True)
@@ -183,7 +187,7 @@ def rebin_1d(
     x_in: np.ndarray,
     array: np.ndarray | ma.MaskedArray,
     x_new: np.ndarray,
-    statistic: str = "mean",
+    statistic: REBIN_STAT = "mean",
 ) -> ma.MaskedArray:
     """Rebins 1D array.
 

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 78
-PATCH = 3
+MINOR = 79
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.78.3.dist-info → cloudnetpy-1.79.0.dist-info}/METADATA

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

{cloudnetpy-1.78.3.dist-info → cloudnetpy-1.79.0.dist-info}/RECORD

@@ -4,12 +4,12 @@ cloudnetpy/cloudnetarray.py,sha256=uOYgpQ8hHh5fuHyip1HjnhsEda9_7dg7orYnbCRkTtI,4
 cloudnetpy/concat_lib.py,sha256=XQ5Sk8kfXqI0Q5HoomKWWhdZ1-m2thYDKGL7SKapITE,12851
 cloudnetpy/constants.py,sha256=YnoSzZm35NDooJfhlulSJBc7g0eSchT3yGytRaTaJEI,845
 cloudnetpy/datasource.py,sha256=Vx_I8S14nFAWKI0VbsW_-sllbVCRjTYxB7XH9b9PedQ,6268
-cloudnetpy/exceptions.py,sha256=hYbUtBwjCIfxnPe_5mELDEw87AWITBrwuo7WYIEKmJ8,1579
+cloudnetpy/exceptions.py,sha256=GBrqCkGxX7qD78LPUxwHpJrEfIeVzbvhs6peWQSBmhM,1723
 cloudnetpy/metadata.py,sha256=lO7BCbVAzFoH3Nq-VuezYX0f7MnbG1Zp11g5GSiuQwM,6189
 cloudnetpy/output.py,sha256=gupxt4f_-eUrFsWMto8tnknoV-p9QauC9L6CJAqBILU,15988
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/utils.py,sha256=HdcSNIgdxoZlP_jHl66ItheHLw_cDYZb7u6mZ5dfMNE,31952
-cloudnetpy/version.py,sha256=pYMEbxEa9ahzrcn_G9DIIY9enBLmzjF9ZpI-AB73HTw,72
+cloudnetpy/utils.py,sha256=WczDeGN408XSgGeaRLXFmlLjgAS67lK1osV0YEuKmwo,32027
+cloudnetpy/version.py,sha256=r_RTjOqOnzkut6bsKX5hTeLYlrSoHQYJsg8Ca85nAOQ,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -35,9 +35,9 @@ cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=qazJzRyXf9vbjJhh4y
 cloudnetpy/instruments/__init__.py,sha256=PEgrrQNoiOuN_ctYilmt4LV2QCLg1likPjJdWtuGlLs,528
 cloudnetpy/instruments/basta.py,sha256=Lb_EhQTI93S5Bd9osDbCE_tC8gZreRsHz7D2_dFOjmE,3793
 cloudnetpy/instruments/bowtie.py,sha256=EyE8HAE8rjO7JelJDbQte_rnwE3VoVJVc6TBpSNK3IU,3930
-cloudnetpy/instruments/ceilo.py,sha256=qM3AkQKHUblhRCD42HsB6lr82giBH-0g_VzoWHZDgeA,9535
+cloudnetpy/instruments/ceilo.py,sha256=GnJYW6oadOApyQSKhzNyJXT4PhoQZlCY9QE4QcqLX8I,9559
 cloudnetpy/instruments/ceilometer.py,sha256=ati9-fUQ54K9tvynIPB-nlBYwtvBVaQtUCjVCLNB67w,12059
-cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
+cloudnetpy/instruments/cl61d.py,sha256=0QMqXHIy0hn2mksAwTdaKMOaEWjsZmj7QZ8hCbcHwxE,2225
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=SGPsRYYoGPoRoDY7hHJcKUVX0A23X0Telc00Fu01PnY,4495
 cloudnetpy/instruments/copernicus.py,sha256=hCphEKyFCc3f1uLRdjL2435kuh64M5q-V1bI68bzGbA,6528
 cloudnetpy/instruments/fd12p.py,sha256=aGYpkczdSl7FSmK1bByMnpUBD5GAl7RTKkopt0cpWas,6822
@@ -60,7 +60,7 @@ cloudnetpy/instruments/weather_station.py,sha256=pZK7I5bk1USDRoTeIhZoWzbka9ciea5
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=HJZrEysQkx9MiIVPDV25CYHpXi_SjgZlgO-otoaKK34,25640
-cloudnetpy/instruments/disdrometer/thies.py,sha256=4T15XW5Hu0SviL_a_PWieIWkZzaVJY92Qm7psSa1kPU,10943
+cloudnetpy/instruments/disdrometer/thies.py,sha256=JwwXExDePJy-57hdWXy0kC84oLqcJbwYopGvmsH605E,11064
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=jnpTxwxLSZdt08By0cjFDmq1KWC4fhJaN_MfjgA8ijQ,6440
 cloudnetpy/model_evaluation/metadata.py,sha256=PAsnOqcUoV3CJwplgWiVCF9Zt4io8tqj7CIgS4fEL-8,8412
@@ -117,10 +117,10 @@ cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=8HPZpQMTojKZP1JS1S83IE0sxmbDE9bxlaWoqmGnUZE,6199
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.78.3.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.79.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.78.3.dist-info/METADATA,sha256=rwmnbibL2ih6Bub0PwnyBbDzEYoSFQLS_IAuERyxDb0,5796
-cloudnetpy-1.78.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.78.3.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.78.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.78.3.dist-info/RECORD,,
+cloudnetpy-1.79.0.dist-info/METADATA,sha256=Z5jTV-IAQDqCM5oV-TQuODjFGDm9K0Iy6itew-2qD4g,5796
+cloudnetpy-1.79.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.79.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.79.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.79.0.dist-info/RECORD,,