cloudnetpy 1.78.4__py3-none-any.whl → 1.79.1__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

@@ -1,5 +1,6 @@
 """Module for reading and processing Vaisala / Lufft ceilometers."""
 
+import logging
 from itertools import islice
 
 import netCDF4
@@ -71,6 +72,8 @@ def ceilo2nc(
     ceilo_obj = _initialize_ceilo(full_path, site_meta, date)
     calibration_factor = site_meta.get("calibration_factor")
     range_corrected = site_meta.get("range_corrected", True)
+    if range_corrected is False:
+        logging.warning("Raw data not range-corrected.")
     ceilo_obj.read_ceilometer_file(calibration_factor)
     ceilo_obj.check_beta_raw_shape()
     n_negatives = _get_n_negatives(ceilo_obj)
@@ -117,11 +120,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/ceilometer.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, NamedTuple
+from typing import NamedTuple
 
 import numpy as np
 from numpy import ma
@@ -8,11 +8,9 @@ from scipy.ndimage import gaussian_filter
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.instruments.instruments import Instrument
 from cloudnetpy.utils import Epoch
 
-if TYPE_CHECKING:
-    from cloudnetpy.instruments.instruments import Instrument
-
 
 class NoiseParam(NamedTuple):
     """Noise parameters. Values are weakly instrument-dependent."""
@@ -47,6 +45,7 @@ class Ceilometer:
             self.data,
             self.noise_param,
             range_corrected=range_corrected,
+            instrument=self.instrument,
         )
         return noisy_data.screen_data(
             array,
@@ -66,6 +65,7 @@ class Ceilometer:
             self.data,
             self.noise_param,
             range_corrected=range_corrected,
+            instrument=self.instrument,
         )
         beta_raw = ma.copy(self.data["beta_raw"])
         cloud_ind, cloud_values, cloud_limit = _estimate_clouds_from_beta(beta)
@@ -145,10 +145,12 @@ class NoisyData:
         noise_param: NoiseParam,
         *,
         range_corrected: bool = True,
+        instrument: Instrument | None = None,
     ):
         self.data = data
         self.noise_param = noise_param
         self.range_corrected = range_corrected
+        self.instrument = instrument
 
     def screen_data(
         self,
@@ -268,14 +270,17 @@ class NoisyData:
         data[:, ind] = data[:, ind] * self._get_range_squared()[ind]
 
     def _get_altitude_ind(self) -> tuple:
-        if self.range_corrected is False:
-            alt_limit = 2400.0
-            logging.warning(
-                "Raw data not range-corrected, correcting below %s m",
-                alt_limit,
-            )
-        else:
-            alt_limit = 1e12
+        alt_limit = 1e12  # All altitudes
+        if (
+            self.range_corrected is False
+            and self.instrument is not None
+            and self.instrument.model is not None
+        ):
+            model = self.instrument.model.lower()
+            if model == "ct25k":
+                alt_limit = 0.0
+            elif model in ("cl31", "cl51"):
+                alt_limit = 2400.0
         return np.where(self.data["range"] < alt_limit)
 
     def _get_range_squared(self) -> np.ndarray:

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/version.py

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

{cloudnetpy-1.78.4.dist-info → cloudnetpy-1.79.1.dist-info}/METADATA

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

{cloudnetpy-1.78.4.dist-info → cloudnetpy-1.79.1.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=WczDeGN408XSgGeaRLXFmlLjgAS67lK1osV0YEuKmwo,32027
-cloudnetpy/version.py,sha256=PsA9X5V3-O4wqAT55qKQUjxDaJreoMoF1C4k2clvJAs,72
+cloudnetpy/version.py,sha256=l8L_HNpJqIkeEmJ8zUGir5O1urLeyDtTP8h6HO2_SFY,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/ceilometer.py,sha256=ati9-fUQ54K9tvynIPB-nlBYwtvBVaQtUCjVCLNB67w,12059
-cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
+cloudnetpy/instruments/ceilo.py,sha256=QQ4pK_GmvQVUgTj1Wc3w8kM6VMKgOxO28pCPrrN1Avg,9664
+cloudnetpy/instruments/ceilometer.py,sha256=XS2hVJ7rn9WOUKq19wpNL5MJr59fKSEWHC_1pOE_Bm4,12323
+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
@@ -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.4.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.79.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.78.4.dist-info/METADATA,sha256=yNApetkcs7v4tbvKRWH3pVT7hsbpES7Q-1lfCIQnw7E,5796
-cloudnetpy-1.78.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.78.4.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.78.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.78.4.dist-info/RECORD,,
+cloudnetpy-1.79.1.dist-info/METADATA,sha256=JtMnhiVSz-jUPZS17gY4BKPyUjYqhvuYl9YB7KC7lxU,5796
+cloudnetpy-1.79.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.79.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.79.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.79.1.dist-info/RECORD,,