cloudnetpy 1.97.2__tar.gz → 1.97.4__tar.gz

{cloudnetpy-1.97.2/cloudnetpy.egg-info → cloudnetpy-1.97.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.2
+Version: 1.97.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -39,7 +39,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: atmoslib>=2.4.2
-Requires-Dist: ceilopyter>=0.2.2
+Requires-Dist: ceilopyter>=0.2.3
 Requires-Dist: cloudnet-api-client
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
@@ -66,7 +66,7 @@ Dynamic: license-file
 
 [![CloudnetPy CI](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml/badge.svg)](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml)
 [![PyPI version](https://img.shields.io/pypi/v/cloudnetpy.svg)](https://pypi.org/project/cloudnetpy/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3666030.svg)](https://doi.org/10.5281/zenodo.3666030)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.3666030-blue)](https://doi.org/10.5281/zenodo.3666030)
 [![status](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7/status.svg)](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7)
 
 CloudnetPy is Python software designed for producing vertical profiles of cloud properties from ground-based

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/README.md

@@ -2,7 +2,7 @@
 
 [![CloudnetPy CI](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml/badge.svg)](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml)
 [![PyPI version](https://img.shields.io/pypi/v/cloudnetpy.svg)](https://pypi.org/project/cloudnetpy/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3666030.svg)](https://doi.org/10.5281/zenodo.3666030)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.3666030-blue)](https://doi.org/10.5281/zenodo.3666030)
 [![status](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7/status.svg)](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7)
 
 CloudnetPy is Python software designed for producing vertical profiles of cloud properties from ground-based

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/instruments/ceilo.py

@@ -9,18 +9,18 @@ from uuid import UUID
 
 import netCDF4
 import numpy as np
-from ceilopyter import read_ct25k
+from ceilopyter import read_ct25k, read_ld40
 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.instruments.vaisala import ClCeilo, Cs135, Ct25k, Ld40
 from cloudnetpy.metadata import COMMON_ATTRIBUTES, MetaData
 from cloudnetpy.utils import get_uuid
 
-CeiloObject = ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135 | Da10
+CeiloObject = ClCeilo | Ct25k | LufftCeilo | Cl61d | Cs135 | Da10 | Ld40
 
 
 def ceilo2nc(
@@ -90,6 +90,20 @@ def ceilo2nc(
         c_obj = read_ct25k(full_path, calibration_factor, range_corrected)
         ceilo_obj.data["beta"] = c_obj.beta
         ceilo_obj.data["beta_raw"] = c_obj.beta_raw
+        ceilo_obj.data["beta_smooth"] = c_obj.beta_smooth
+        ceilo_obj.data["time"] = c_obj.time
+        ceilo_obj.data["range"] = c_obj.range
+        if c_obj.zenith_angle is not None:
+            ceilo_obj.data["zenith_angle"] = np.median(c_obj.zenith_angle)
+        ceilo_obj.data["calibration_factor"] = c_obj.calibration_factor
+        ceilo_obj.sort_time()
+        ceilo_obj.screen_date()
+        ceilo_obj.convert_to_fraction_hour()
+    elif isinstance(ceilo_obj, Ld40):
+        c_obj = read_ld40(full_path, calibration_factor)
+        ceilo_obj.data["beta"] = c_obj.beta
+        ceilo_obj.data["beta_raw"] = c_obj.beta_raw
+        ceilo_obj.data["beta_smooth"] = c_obj.beta_smooth
         ceilo_obj.data["time"] = c_obj.time
         ceilo_obj.data["range"] = c_obj.range
         if c_obj.zenith_angle is not None:
@@ -174,6 +188,7 @@ def _initialize_ceilo(
             "chm15k",
             "cs135",
             "da10",
+            "ld40",
         ):
             msg = f"Invalid ceilometer model: {site_meta['model']}"
             raise ValueError(msg)
@@ -193,6 +208,8 @@ def _initialize_ceilo(
         return Da10(full_path, site_meta, date)
     if model == "cs135":
         return Cs135(full_path, site_meta, date)
+    if model == "ld40":
+        return Ld40(full_path, site_meta, date)
     return LufftCeilo(full_path, site_meta, date)
 
 

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/instruments/instruments.py

@@ -51,6 +51,14 @@ CT25K = Instrument(
     wavelength=905.0,
 )
 
+LD40 = Instrument(
+    manufacturer="Vaisala",
+    domain="lidar",
+    category="ceilometer",
+    model="LD40",
+    wavelength=855.0,
+)
+
 CL61D = Instrument(
     manufacturer="Vaisala",
     domain="lidar",

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/instruments/lufft.py

@@ -34,6 +34,7 @@ class LufftCeilo(Ceilometer):
         ceilo = read_chm15k(self.file_name, calibration_factor)
         self.data["beta"] = ceilo.beta
         self.data["beta_raw"] = ceilo.beta_raw
+        self.data["beta_smooth"] = ceilo.beta_smooth
         self.data["time"] = ceilo.time
         self.data["range"] = ceilo.range
         if ceilo.zenith_angle is not None:

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/instruments/mira.py

@@ -43,7 +43,10 @@ def mira2nc(
         site_meta: Dictionary containing information about the site. Required
             key-value pair is `name`. Optional `model` takes `mira-35` (default),
             `mira-35s`, `mira-35c`, or `mira-10`. Optional `radar_constant` (dB)
-            is used to calculate Zh from SNRg in old files without Zg.
+            is used to calculate Zh from SNRg in old files without Zg. Optional
+            `zenith_angle` (deg) overrides the angle reported in the raw file.
+            Optional `zenith_offset` and `azimuth_offset` (deg) are added to the
+            angles reported in the raw file.
         uuid: Set specific UUID for the file.
         date: Expected date as YYYY-MM-DD of all profiles in the file.
 
@@ -89,6 +92,10 @@ def mira2nc(
                 # Empirical values, should be checked
                 snr_limit = -30 if mira.instrument == MIRA10 else -17
 
+            zenith = site_meta.get("zenith_angle")
+            if zenith is not None:
+                mira.override_elevation_angle(zenith=zenith)
+
             # Old MIRA files don't have angle variables.
             if "elevation" not in mira.data:
                 mira.append_data(ma.masked_all_like(mira.time.data), "elevation")
@@ -156,6 +163,13 @@ class Mira(NcRadar):
             output[key] = value.strip()
         return output
 
+    def override_elevation_angle(self, zenith: float) -> None:
+        if not isinstance(zenith, int | float) or zenith < -90 or zenith > 90:
+            msg = f"Invalid zenith angle: {zenith}"
+            raise ValueError(msg)
+        elevation = float(90 - zenith)
+        self.append_data(np.repeat(elevation, len(self.time)), "elevation")
+
     def add_radar_frequency(self) -> None:
         # XMT should always be present. In newer files, there's also
         # LO_frequency variable which doesn't match XMT exactly and sometimes

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/instruments/vaisala.py

@@ -7,7 +7,7 @@ from os import PathLike
 import ceilopyter.version
 import numpy as np
 import numpy.typing as npt
-from ceilopyter import read_cl_file, read_cs_file, read_ct_file
+from ceilopyter import read_cl_file, read_cs_file
 
 from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
@@ -118,13 +118,31 @@ class Ct25k(VaisalaCeilo):
         site_meta: dict,
         expected_date: datetime.date | None = None,
     ) -> None:
-        super().__init__(read_ct_file, full_path, site_meta, expected_date)
+        super().__init__(no_reader, full_path, site_meta, expected_date)
         self._store_ceilometer_info()
 
     def _store_ceilometer_info(self) -> None:
         self.instrument = instruments.CT25K
 
 
+class Ld40(VaisalaCeilo):
+    """Class for Vaisala LD40 ceilometer."""
+
+    noise_param = NoiseParam(noise_min=0.7e-7, noise_smooth_min=1.2e-8)
+
+    def __init__(
+        self,
+        full_path: str | PathLike,
+        site_meta: dict,
+        expected_date: datetime.date | None = None,
+    ) -> None:
+        super().__init__(no_reader, full_path, site_meta, expected_date)
+        self._store_ceilometer_info()
+
+    def _store_ceilometer_info(self) -> None:
+        self.instrument = instruments.LD40
+
+
 class Cs135(VaisalaCeilo):
     """Class for Campbell Scientific CS135 ceilometer."""
 
@@ -140,3 +158,8 @@ class Cs135(VaisalaCeilo):
 
     def _store_ceilometer_info(self) -> None:
         self.instrument = instruments.CS135
+
+
+def no_reader() -> None:
+    msg = "No ceilometer reader"
+    raise RuntimeError(msg)

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy/version.py

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

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.97.2
+Version: 1.97.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -39,7 +39,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: atmoslib>=2.4.2
-Requires-Dist: ceilopyter>=0.2.2
+Requires-Dist: ceilopyter>=0.2.3
 Requires-Dist: cloudnet-api-client
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
@@ -66,7 +66,7 @@ Dynamic: license-file
 
 [![CloudnetPy CI](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml/badge.svg)](https://github.com/actris-cloudnet/cloudnetpy/actions/workflows/test.yml)
 [![PyPI version](https://img.shields.io/pypi/v/cloudnetpy.svg)](https://pypi.org/project/cloudnetpy/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3666030.svg)](https://doi.org/10.5281/zenodo.3666030)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.3666030-blue)](https://doi.org/10.5281/zenodo.3666030)
 [![status](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7/status.svg)](https://joss.theoj.org/papers/959971f196f617dddc0e7d8333ff22b7)
 
 CloudnetPy is Python software designed for producing vertical profiles of cloud properties from ground-based

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/cloudnetpy.egg-info/requires.txt

@@ -1,5 +1,5 @@
 atmoslib>=2.4.2
-ceilopyter>=0.2.2
+ceilopyter>=0.2.3
 cloudnet-api-client
 doppy>=0.5.0
 matplotlib

{cloudnetpy-1.97.2 → cloudnetpy-1.97.4}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
 ]
 dependencies = [
   "atmoslib>=2.4.2",
-  "ceilopyter>=0.2.2",
+  "ceilopyter>=0.2.3",
   "cloudnet-api-client",
   "doppy>=0.5.0",
   "matplotlib",