cloudnetpy 1.84.1__tar.gz → 1.85.0__tar.gz

{cloudnetpy-1.84.1/cloudnetpy.egg-info → cloudnetpy-1.85.0}/PKG-INFO

@@ -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 → cloudnetpy-1.85.0}/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-1.84.1 → cloudnetpy-1.85.0}/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-1.85.0/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-1.84.1 → cloudnetpy-1.85.0}/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-1.84.1 → cloudnetpy-1.85.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-1.84.1 → cloudnetpy-1.85.0}/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 → cloudnetpy-1.85.0/cloudnetpy.egg-info}/PKG-INFO

@@ -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 → cloudnetpy-1.85.0}/cloudnetpy.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ cloudnetpy/instruments/ceilometer.py
 cloudnetpy/instruments/cl61d.py
 cloudnetpy/instruments/cloudnet_instrument.py
 cloudnetpy/instruments/copernicus.py
+cloudnetpy/instruments/da10.py
 cloudnetpy/instruments/fd12p.py
 cloudnetpy/instruments/galileo.py
 cloudnetpy/instruments/hatpro.py