cloudnetpy 1.84.1__py3-none-any.whl → 1.85.0__py3-none-any.whl

cloudnetpy/instruments/ceilo.py

@@ -14,11 +14,14 @@ from numpy import ma
 
 from cloudnetpy import output
 from cloudnetpy.instruments.cl61d import Cl61d
+from cloudnetpy.instruments.da10 import Da10
 from cloudnetpy.instruments.lufft import LufftCeilo
 from cloudnetpy.instruments.vaisala import ClCeilo, Cs135, Ct25k
 from cloudnetpy.metadata import COMMON_ATTRIBUTES, MetaData
 from cloudnetpy.utils import get_uuid
 
+CeiloObject = ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135 | Da10
+
 
 def ceilo2nc(
     full_path: str | PathLike,
@@ -30,7 +33,7 @@ def ceilo2nc(
     """Converts Vaisala, Lufft and Campbell Scientific ceilometer data into
     Cloudnet Level 1b netCDF file.
 
-    This function reads raw Vaisala (CT25k, CL31, CL51, CL61), Lufft
+    This function reads raw Vaisala (CT25k, CL31, CL51, CL61, DA10), Lufft
     (CHM 15k, CHM 15k-x) and Campbell Scientific (CS135) ceilometer files and writes
     the data into netCDF file. Three variants of the backscatter are saved:
 
@@ -44,8 +47,8 @@ def ceilo2nc(
         2. SNR-screened depolarisation with smoothed weak background,
            `depolarisation_smooth`
 
-    CL61 screened backscatter is screened using beta_smooth mask to improve detection
-    of weak aerosol layers and supercooled liquid clouds.
+    With most instruments, screened backscatter is screened using beta_smooth
+    mask to improve detection of weak aerosol layers and supercooled liquid clouds.
 
     Args:
         full_path: Ceilometer file name.
@@ -118,7 +121,7 @@ def ceilo2nc(
         if (
             any(
                 model in ceilo_obj.instrument.model.lower()
-                for model in ("cl61", "chm15k", "chm15kx", "cl51", "cl31")
+                for model in ("cl61", "chm15k", "chm15kx", "cl51", "cl31", "da10")
             )
             and range_corrected
         ):
@@ -141,7 +144,7 @@ def ceilo2nc(
     return uuid
 
 
-def _get_n_negatives(ceilo_obj: ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135) -> int:
+def _get_n_negatives(ceilo_obj: CeiloObject) -> int:
     is_old_chm_version = (
         hasattr(ceilo_obj, "is_old_version") and ceilo_obj.is_old_version
     )
@@ -157,7 +160,7 @@ def _initialize_ceilo(
     full_path: str | PathLike,
     site_meta: dict,
     date: datetime.date | None = None,
-) -> ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135:
+) -> CeiloObject:
     if "model" in site_meta:
         if site_meta["model"] not in (
             "cl31",
@@ -166,6 +169,7 @@ def _initialize_ceilo(
             "ct25k",
             "chm15k",
             "cs135",
+            "da10",
         ):
             msg = f"Invalid ceilometer model: {site_meta['model']}"
             raise ValueError(msg)
@@ -181,6 +185,8 @@ def _initialize_ceilo(
         return Ct25k(full_path, site_meta, date)
     if model == "cl61d":
         return Cl61d(full_path, site_meta, date)
+    if model == "da10":
+        return Da10(full_path, site_meta, date)
     if model == "cs135":
         return Cs135(full_path, site_meta, date)
     return LufftCeilo(full_path, site_meta, date)

cloudnetpy/instruments/cl61d.py

@@ -1,5 +1,3 @@
-"""Module with a class for Lufft chm15k ceilometer."""
-
 import datetime
 import logging
 from os import PathLike

cloudnetpy/instruments/da10.py

@@ -0,0 +1,54 @@
+import datetime
+import logging
+from os import PathLike
+
+import netCDF4
+
+from cloudnetpy import utils
+from cloudnetpy.exceptions import LidarDataError
+from cloudnetpy.instruments import instruments
+from cloudnetpy.instruments.nc_lidar import NcLidar
+
+
+class Da10(NcLidar):
+    """Class for Vaisala DA10 differential absorption lidar."""
+
+    def __init__(
+        self,
+        file_name: str | PathLike,
+        site_meta: dict,
+        expected_date: datetime.date | None = None,
+    ) -> None:
+        super().__init__()
+        self.file_name = file_name
+        self.site_meta = site_meta
+        self.expected_date = expected_date
+        self.instrument = instruments.DA10
+
+    def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
+        with netCDF4.Dataset(self.file_name) as dataset:
+            self.dataset = dataset
+            self._fetch_attributes()
+            self._fetch_zenith_angle("tilt_angle", default=3.0)
+            self._fetch_range(reference="lower")
+            self._fetch_lidar_variables(calibration_factor)
+            self._fetch_time_and_date()
+            self.dataset = None
+
+    def _fetch_lidar_variables(self, calibration_factor: float | None = None) -> None:
+        if self.dataset is None:
+            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
+        beta_raw *= calibration_factor
+        self.data["calibration_factor"] = float(calibration_factor)
+        self.data["beta_raw"] = beta_raw
+
+    def _fetch_attributes(self) -> None:
+        self.serial_number = getattr(self.dataset, "instrument_serial_number", None)

cloudnetpy/instruments/instruments.py

@@ -253,3 +253,11 @@ FD12P = Instrument(
     category="present weather sensor",
     model="FD12P",
 )
+
+DA10 = Instrument(
+    manufacturer="Vaisala",
+    domain="lidar",
+    category="differential absorption lidar",
+    model="DA10",
+    wavelength=911.0,
+)

cloudnetpy/instruments/nc_radar.py

@@ -113,6 +113,10 @@ class NcRadar(DataSource, CloudnetInstrument):
             self.append_data(azimuth_offset, "azimuth_offset")
             azimuth += azimuth_offset
 
+        if len(elevation) < 2 or len(azimuth) < 2:
+            msg = "Less than two profiles with valid zenith / azimuth angles"
+            raise ValidTimeStampError(msg)
+
         elevation_diff = ma.diff(elevation, prepend=elevation[1])
         azimuth_diff = ma.diff(azimuth, prepend=azimuth[1])
 

cloudnetpy/version.py

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

{cloudnetpy-1.84.1.dist-info → cloudnetpy-1.85.0.dist-info}/METADATA

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

{cloudnetpy-1.84.1.dist-info → cloudnetpy-1.85.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=CFpXmdEkVPzvLPv2xHIR-aMMQ-TR26KfESYw-98j7sk,7213
 cloudnetpy/output.py,sha256=0bybnILsgKHWIuw2GYkqTz2iMCJDZLUN25IQ9o_v3Cg,14968
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=O5kEXMt03fFKabPxRiCfuahVfTqa4fWWZ11orQnQeXU,33530
-cloudnetpy/version.py,sha256=Bu6a1uNfyNGLiB1RFZ8fIdr7uvx-Ng5jWbU9Y5hazl0,72
+cloudnetpy/version.py,sha256=lLtOfbPTOgEcz4-gTcFPYaor-U52n66zRHoLKjGWJ30,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -35,20 +35,21 @@ cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=wJPyCiKWzsQDzMhqbA
 cloudnetpy/instruments/__init__.py,sha256=PEgrrQNoiOuN_ctYilmt4LV2QCLg1likPjJdWtuGlLs,528
 cloudnetpy/instruments/basta.py,sha256=N-kRgl5Vm52pXzr9umo4YsA0hn4zZCOa-0_zZTzhheY,4284
 cloudnetpy/instruments/bowtie.py,sha256=WZYB_o90I5QKOupCRjzZU4Mi54oX_3teyAPBDUogwRI,4301
-cloudnetpy/instruments/ceilo.py,sha256=GJ1ZVX6aEMAZw1cpTXcNy9imfuPAkoqmrLQyUc00UEo,8809
+cloudnetpy/instruments/ceilo.py,sha256=scb3n0gLOZ1gPs_WdWw9KS5Ut_mtCvSdWFMKKCvXhBI,8979
 cloudnetpy/instruments/ceilometer.py,sha256=c37uteeuGnlE-o-Smu49H2qQJw6qZ0tc3Bzhyr1FoSo,13063
-cloudnetpy/instruments/cl61d.py,sha256=3YMisWZ-nTX29I8hFNXrKc73rMPolqAO0lPmqpGamjk,2294
+cloudnetpy/instruments/cl61d.py,sha256=JsCHqVzFGhZi-5xcnsB507FDpyuw83uSWK3IFO3DhdI,2238
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=B1UkiB0ytnT3MWYalEegql5QIPaMLg5bJy5xI50JEco,4503
 cloudnetpy/instruments/copernicus.py,sha256=ygEViERBSJdMeP9OxfLelZRDEbSRzY8n17ruYie2wm4,6970
+cloudnetpy/instruments/da10.py,sha256=FcXEu6dfAVvYzMvauiJBSyEkYhGa8hBuwrrdo-3LwHE,1960
 cloudnetpy/instruments/fd12p.py,sha256=5TFyNO26VGpO4ts9UIJiuLo4LUwQPHO6aK2fTnOtaKY,7019
 cloudnetpy/instruments/galileo.py,sha256=f_-GkRxhNaQPbI8HpOwSmoKfGqyjmD16A0ZFgwLOIig,5137
 cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIoj3I,10248
-cloudnetpy/instruments/instruments.py,sha256=z8Osjww3iQRxKvzXdISl-5vV6gShtji8Db5k-ZzDQ-0,4843
+cloudnetpy/instruments/instruments.py,sha256=WZgH7HjzM9Ane1CSnYCSLidbST8hunUeSt2lPntq9As,4999
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
 cloudnetpy/instruments/mira.py,sha256=XqmbytpeCJ2-hNugxdsXSBUDB8SAUc97_6lo5mHFG8E,11840
 cloudnetpy/instruments/mrr.py,sha256=z50VYLOBW2o7enU7FHZYNFQRW2goEQpeGe7-iCBRQtg,6020
 cloudnetpy/instruments/nc_lidar.py,sha256=PtZauDdI3bX3bv4gIVvV6N53e2Co-ehBL_tByHM9hj8,1713
-cloudnetpy/instruments/nc_radar.py,sha256=9npjF9xfMY5DkDPpesqAIhrmv1QqPlKB9J-cySI2UbU,7360
+cloudnetpy/instruments/nc_radar.py,sha256=XFKxPLKivnhHTgjE5HFrxjWZ0oCifhDUAog051vkMiY,7533
 cloudnetpy/instruments/pollyxt.py,sha256=IFq_RJrhgJ79OVyuo48PwYQK_zZ6VZFB_S5bEirRyzs,10566
 cloudnetpy/instruments/radiometrics.py,sha256=QKfnrZlQ0sFcFjmv1ShnCMTJQv64w4akjK-JAIY4gCg,16116
 cloudnetpy/instruments/rain_e_h3.py,sha256=fjv3SgeUNx9GisYqLrBnX9AjnO17VtouyoPh12VE9uo,5465
@@ -117,10 +118,10 @@ cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.84.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.85.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.84.1.dist-info/METADATA,sha256=6IQo1hk6eXK0J5wAS1OGOxkAT3JvJga3Z0QJhQ2N3z0,5836
-cloudnetpy-1.84.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.84.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.84.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.84.1.dist-info/RECORD,,
+cloudnetpy-1.85.0.dist-info/METADATA,sha256=RWZNjL4m1yNEhDoSpqzyUODXSsh3AULjma2QRrNd2HU,5836
+cloudnetpy-1.85.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.85.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.85.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.85.0.dist-info/RECORD,,