cloudnetpy 1.96.6__tar.gz → 1.96.7__tar.gz

{cloudnetpy-1.96.6/cloudnetpy.egg-info → cloudnetpy-1.96.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.96.6
+Version: 1.96.7
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -35,11 +35,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: atmoslib>=2.4.2
-Requires-Dist: ceilopyter>=0.2.0
+Requires-Dist: ceilopyter>=0.2.2
 Requires-Dist: cloudnet-api-client
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
@@ -48,7 +48,6 @@ Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5
 Requires-Dist: scipy
-Requires-Dist: typing-extensions
 Provides-Extra: test
 Requires-Dist: cloudnetpy_qc; extra == "test"
 Requires-Dist: mypy; extra == "test"

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/categorize/categorize.py

@@ -5,12 +5,11 @@ import logging
 from collections.abc import Sequence
 from dataclasses import fields
 from os import PathLike
-from typing import TypedDict
+from typing import NotRequired, TypedDict
 from uuid import UUID
 
 import numpy as np
 from numpy.typing import NDArray
-from typing_extensions import NotRequired
 
 from cloudnetpy import output, utils
 from cloudnetpy.categorize import attenuation, classify

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/cli.py

@@ -888,7 +888,7 @@ def main() -> None:
         "--date",
         type=str,
         help="Date in YYYY-MM-DD (default: today)",
-        default=datetime.datetime.now(tz=datetime.timezone.utc).date().isoformat(),
+        default=datetime.datetime.now(tz=datetime.UTC).date().isoformat(),
     )
     parser.add_argument(
         "-p",

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/concat_lib.py

@@ -7,13 +7,12 @@ from collections.abc import Iterable, Sequence
 from os import PathLike
 from pathlib import Path
 from types import TracebackType
-from typing import Literal
+from typing import Literal, Self
 
 import netCDF4
 import numpy as np
 import numpy.typing as npt
 from numpy import ma
-from typing_extensions import Self
 
 from cloudnetpy import utils
 from cloudnetpy.exceptions import ValidTimeStampError

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/datasource.py

@@ -6,11 +6,11 @@ import os
 from collections.abc import Callable
 from os import PathLike
 from types import TracebackType
+from typing import Self
 
 import netCDF4
 import numpy as np
 import numpy.typing as npt
-from typing_extensions import Self
 
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/ceilo.py

@@ -98,6 +98,11 @@ def ceilo2nc(
         ceilo_obj.sort_time()
         ceilo_obj.screen_date()
         ceilo_obj.convert_to_fraction_hour()
+    elif isinstance(ceilo_obj, LufftCeilo):
+        ceilo_obj.read_ceilometer_file(calibration_factor)
+        ceilo_obj.sort_time()
+        ceilo_obj.screen_date()
+        ceilo_obj.convert_to_fraction_hour()
     else:
         ceilo_obj.read_ceilometer_file(calibration_factor)
         ceilo_obj.check_beta_raw_shape()

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/ceilometer.py

@@ -83,7 +83,13 @@ class Ceilometer:
 
     def prepare_data(self) -> None:
         """Add common additional data / metadata and convert into CloudnetArrays."""
-        zenith_angle = self.data["zenith_angle"]
+        zenith_angle = self.data.get("zenith_angle")
+        if zenith_angle is None:
+            zenith_angle = 3.0
+            logging.warning("No zenith angle found, assuming %s degrees", zenith_angle)
+            self.data["zenith_angle"] = zenith_angle
+        elif zenith_angle == 0:
+            logging.warning("Zenith angle 0 degrees - risk of specular reflection")
         self.data["height"] = np.array(
             self.site_meta["altitude"]
             + utils.range_to_height(self.data["range"], zenith_angle),

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/hatpro.py

@@ -97,7 +97,7 @@ def hatpro2l1c(
             msg = "Timestamps are not increasing"
             raise RuntimeError(msg)
         dates = [
-            datetime.datetime.fromtimestamp(t, tz=datetime.timezone.utc).date()
+            datetime.datetime.fromtimestamp(t, tz=datetime.UTC).date()
             for t in timestamps
         ]
         if len(set(dates)) != 1:

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/kazr.py

@@ -403,7 +403,7 @@ class Kazr(CloudnetInstrument):
         if not hasattr(self, "date"):
             self.date = epoch.date()
         midnight = datetime.datetime.combine(
-            self.date, datetime.time.min, tzinfo=datetime.timezone.utc
+            self.date, datetime.time.min, tzinfo=datetime.UTC
         )
         return seconds + (epoch - midnight).total_seconds()
 
@@ -519,9 +519,7 @@ def _parse_time_units(units: str) -> datetime.datetime:
     text = " ".join(parts[2:4])
     for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%d"):
         try:
-            return datetime.datetime.strptime(text, fmt).replace(
-                tzinfo=datetime.timezone.utc
-            )
+            return datetime.datetime.strptime(text, fmt).replace(tzinfo=datetime.UTC)
         except ValueError:
             continue
     msg = f"Invalid time units: {units}"

cloudnetpy-1.96.7/cloudnetpy/instruments/lufft.py

@@ -0,0 +1,79 @@
+"""Module with a class for Lufft chm15k ceilometer."""
+
+import datetime
+from os import PathLike
+
+import numpy as np
+import numpy.typing as npt
+from ceilopyter import read_chm15k
+from ceilopyter.version import __version__ as ceilopyter_version
+from numpy import ma
+
+from cloudnetpy import utils
+from cloudnetpy.instruments import instruments
+from cloudnetpy.instruments.ceilometer import Ceilometer
+
+
+class LufftCeilo(Ceilometer):
+    """Class for Lufft chm15k ceilometer."""
+
+    def __init__(
+        self,
+        file_name: str | PathLike | list[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.software = {"ceilopyter": ceilopyter_version}
+
+    def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
+        """Reads data and metadata from Jenoptik netCDF file."""
+        ceilo = read_chm15k(self.file_name, calibration_factor)
+        self.data["beta"] = ceilo.beta
+        self.data["beta_raw"] = ceilo.beta_raw
+        self.data["time"] = ceilo.time
+        self.data["range"] = ceilo.range
+        if ceilo.zenith_angle is not None:
+            self.data["zenith_angle"] = ma.median(ceilo.zenith_angle)
+        self.data["calibration_factor"] = ceilo.calibration_factor
+        self.serial_number = ceilo.serial_number
+        self.instrument = (
+            instruments.CHM15KX
+            if ceilo.serial_number and ceilo.serial_number.startswith("CHX")
+            else instruments.CHM15K
+        )
+
+    def sort_time(self) -> None:
+        """Sorts timestamps and removes duplicates."""
+        time = self.data["time"]
+        _time, ind = np.unique(time, return_index=True)
+        self._screen_time_indices(ind)
+
+    def screen_date(self) -> None:
+        time = self.data["time"]
+        self.date = time[0].date() if self.expected_date is None else self.expected_date
+        is_valid = np.array([t.date() == self.date for t in time])
+        self._screen_time_indices(is_valid)
+
+    def _screen_time_indices(
+        self, valid_indices: npt.NDArray[np.intp] | npt.NDArray[np.bool_]
+    ) -> None:
+        time = self.data["time"]
+        n_time = len(time)
+        if len(valid_indices) == 0 or (
+            valid_indices.dtype == np.bool_ and not np.any(valid_indices)
+        ):
+            msg = "All timestamps screened"
+            raise utils.ValidTimeStampError(msg)
+        for key, array in self.data.items():
+            if hasattr(array, "shape") and array.shape[:1] == (n_time,):
+                self.data[key] = self.data[key][valid_indices]
+
+    def convert_to_fraction_hour(self) -> None:
+        time = self.data["time"]
+        midnight = time[0].replace(hour=0, minute=0, second=0, microsecond=0)
+        hour = datetime.timedelta(hours=1)
+        self.data["time"] = np.array([(t - midnight) / hour for t in time])

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/mira.py

@@ -128,7 +128,7 @@ class Mira(NcRadar):
 
     """
 
-    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
+    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)
 
     def __init__(self, full_path: str | PathLike, site_meta: dict) -> None:
         super().__init__(full_path, site_meta)

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/mrr.py

@@ -126,7 +126,7 @@ class MrrPro(NcRadar):
 
     """
 
-    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
+    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)
 
     def __init__(self, full_path: PathLike | str, site_meta: dict) -> None:
         super().__init__(full_path, site_meta)

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/instruments/weather_station.py

@@ -223,7 +223,7 @@ class PalaiseauWS(WS):
                         continue
                     timestamp = datetime.datetime.strptime(
                         columns[0], "%Y-%m-%dT%H:%M:%SZ"
-                    ).replace(tzinfo=datetime.timezone.utc)
+                    ).replace(tzinfo=datetime.UTC)
                     values.append([timestamp] + [float(x) for x in columns[1:]])
                     timestamps.append(timestamp)
                 else:
@@ -750,12 +750,12 @@ def _parse_sirta(filename: str | PathLike) -> dict:
             parsed: float | datetime.datetime
             if column == "Date Time (yyyy-mm-ddThh:mm:ss)":
                 parsed = datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%S").replace(
-                    tzinfo=datetime.timezone.utc
+                    tzinfo=datetime.UTC
                 )
             elif column == "Date Time (yyyy-mm-ddThh:mm:ssZ)":
                 parsed = datetime.datetime.strptime(
                     value, "%Y-%m-%dT%H:%M:%SZ"
-                ).replace(tzinfo=datetime.timezone.utc)
+                ).replace(tzinfo=datetime.UTC)
             else:
                 try:
                     parsed = float(value)
@@ -794,7 +794,7 @@ class LAquilaWS(WS):
                         continue
                     timestamp = datetime.datetime.strptime(
                         columns[0], "%Y-%m-%dT%H:%M:%SZ"
-                    ).replace(tzinfo=datetime.timezone.utc)
+                    ).replace(tzinfo=datetime.UTC)
                     data["time"].append(timestamp)
                     data["air_temperature"].append(self._parse_value(columns[1]))
                     data["air_pressure"].append(self._parse_value(columns[2]))
@@ -852,7 +852,7 @@ class ClujWS(WS):
 
     def _parse_datetime(self, value: str) -> datetime.datetime:
         return datetime.datetime.strptime(value, "%d.%m.%y %H:%M:%S.%f").replace(
-            tzinfo=datetime.timezone.utc
+            tzinfo=datetime.UTC
         )
 
     def _parse_value(self, value: str) -> float:

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/model_evaluation/products/observation_products.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from os import PathLike
 
 import numpy as np
@@ -43,7 +43,7 @@ class ObservationManager(DataSource):
             0,
             0,
             0,
-            tzinfo=timezone.utc,
+            tzinfo=UTC,
         )
 
     def _get_radar_frequency(self) -> npt.NDArray | None:

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/output.py

@@ -276,7 +276,7 @@ def merge_history(
             )
         except ValueError:
             return datetime.datetime.min.replace(
-                tzinfo=datetime.timezone.utc
+                tzinfo=datetime.UTC
             )  # malformed lines to bottom
 
     histories.sort(key=parse_time, reverse=True)

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/plotting/plotting.py

@@ -3,7 +3,7 @@
 import re
 import textwrap
 from dataclasses import dataclass
-from datetime import date, datetime, timedelta, timezone
+from datetime import UTC, date, datetime, timedelta
 from os import PathLike
 from typing import Any
 
@@ -180,7 +180,7 @@ class FigureData:
             int(self.file.year),
             int(self.file.month),
             int(self.file.day),
-            tzinfo=timezone.utc,
+            tzinfo=UTC,
         )
 
     def _get_valid_variables_and_indices(

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/utils.py

@@ -52,9 +52,7 @@ def seconds2hours(time_in_seconds: npt.NDArray) -> npt.NDArray:
 
 def seconds2date(
     time_in_seconds: float,
-    epoch: datetime.datetime = datetime.datetime(
-        2001, 1, 1, tzinfo=datetime.timezone.utc
-    ),
+    epoch: datetime.datetime = datetime.datetime(2001, 1, 1, tzinfo=datetime.UTC),
 ) -> datetime.datetime:
     """Converts seconds since some epoch to datetime (UTC).
 
@@ -753,7 +751,7 @@ def isscalar(array: npt.NDArray | float | list | netCDF4.Variable) -> bool:
 
 def get_time() -> str:
     """Returns current UTC-time."""
-    t_zone = datetime.timezone.utc
+    t_zone = datetime.UTC
     form = "%Y-%m-%d %H:%M:%S"
     return f"{datetime.datetime.now(tz=t_zone).strftime(form)} +00:00"
 
@@ -924,7 +922,7 @@ def str_to_numeric(value: str) -> int | float:
 
 def get_epoch(units: str) -> datetime.datetime:
     """Finds epoch from units string."""
-    fallback = datetime.datetime(2001, 1, 1, tzinfo=datetime.timezone.utc)
+    fallback = datetime.datetime(2001, 1, 1, tzinfo=datetime.UTC)
     try:
         date = units.split()[2]
     except IndexError:
@@ -940,9 +938,9 @@ def get_epoch(units: str) -> datetime.datetime:
         except ValueError:
             return fallback
     year, month, day = date_components
-    current_year = datetime.datetime.now(tz=datetime.timezone.utc).year
+    current_year = datetime.datetime.now(tz=datetime.UTC).year
     if (1900 < year <= current_year) and (0 < month < 13) and (0 < day < 32):
-        return datetime.datetime(year, month, day, tzinfo=datetime.timezone.utc)
+        return datetime.datetime(year, month, day, tzinfo=datetime.UTC)
     return fallback
 
 

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 96
-PATCH = 6
+PATCH = 7
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.96.6
+Version: 1.96.7
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -35,11 +35,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: atmoslib>=2.4.2
-Requires-Dist: ceilopyter>=0.2.0
+Requires-Dist: ceilopyter>=0.2.2
 Requires-Dist: cloudnet-api-client
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
@@ -48,7 +48,6 @@ Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5
 Requires-Dist: scipy
-Requires-Dist: typing-extensions
 Provides-Extra: test
 Requires-Dist: cloudnetpy_qc; extra == "test"
 Requires-Dist: mypy; extra == "test"

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/cloudnetpy.egg-info/requires.txt

@@ -1,5 +1,5 @@
 atmoslib>=2.4.2
-ceilopyter>=0.2.0
+ceilopyter>=0.2.2
 cloudnet-api-client
 doppy>=0.5.0
 matplotlib
@@ -8,7 +8,6 @@ netCDF4
 requests
 rpgpy>=0.14.5
 scipy
-typing-extensions
 
 [dev]
 pre-commit

{cloudnetpy-1.96.6 → cloudnetpy-1.96.7}/pyproject.toml

@@ -4,7 +4,7 @@ description = "Python package for Cloudnet processing"
 authors = [{name = "Simo Tukiainen"}]
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Science/Research",
@@ -15,7 +15,7 @@ classifiers = [
 ]
 dependencies = [
   "atmoslib>=2.4.2",
-  "ceilopyter>=0.2.0",
+  "ceilopyter>=0.2.2",
   "cloudnet-api-client",
   "doppy>=0.5.0",
   "matplotlib",
@@ -24,7 +24,6 @@ dependencies = [
   "requests",
   "rpgpy>=0.14.5",
   "scipy",
-  "typing-extensions",
 ]
 dynamic = ["version"]
 

cloudnetpy-1.96.6/cloudnetpy/instruments/lufft.py

@@ -1,113 +0,0 @@
-"""Module with a class for Lufft chm15k ceilometer."""
-
-import datetime
-import logging
-from os import PathLike
-
-import netCDF4
-import numpy as np
-from numpy import ma
-
-from cloudnetpy import utils
-from cloudnetpy.instruments import instruments
-from cloudnetpy.instruments.nc_lidar import NcLidar
-
-
-class LufftCeilo(NcLidar):
-    """Class for Lufft chm15k ceilometer."""
-
-    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.is_old_version = False
-
-    def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
-        """Reads data and metadata from Jenoptik netCDF file."""
-        with netCDF4.Dataset(self.file_name) as dataset:
-            self.dataset = dataset
-            self._fetch_attributes()
-            self._fetch_range(reference="upper")
-            self._fetch_beta_raw(calibration_factor)
-            self._fetch_time_and_date()
-            self._fetch_zenith_angle("zenith")
-
-    def _fetch_beta_raw(self, calibration_factor: float | None = None) -> None:
-        if calibration_factor is None:
-            logging.warning("Using default calibration factor")
-            calibration_factor = 3e-12
-        beta_raw = self._getvar("beta_raw", "beta_att")
-        beta_raw = ma.array(beta_raw)
-        old_version = self._get_old_software_version()
-        if old_version is not None:
-            self.is_old_version = True
-            logging.warning(
-                "Software version %s. Assuming data not range corrected.",
-                old_version,
-            )
-            data_std = self._getvar("stddev")
-            normalised_apd = self._get_nn()
-            beta_raw *= utils.transpose(ma.array(data_std / normalised_apd))
-            beta_raw *= self.data["range"] ** 2
-        beta_raw *= calibration_factor
-        self.data["calibration_factor"] = float(calibration_factor)
-        self.data["beta_raw"] = beta_raw
-
-    def _get_old_software_version(self) -> str | None:
-        if self.dataset is None:
-            msg = "No dataset found"
-            raise RuntimeError(msg)
-        version = self.dataset.software_version
-        # In old files, the version is a single integer.
-        if isinstance(version, np.integer):
-            return str(version)
-        # In newer files, the version is a space-separated list: Operating
-        # system, FPGA, firmware, CloudDetectionMode (added in firmware 0.747).
-        if isinstance(version, str):
-            parts = version.split()
-            firmware = parts[2]
-            if firmware < "0.702":
-                return firmware
-            return None
-        msg = f"Cannot determine version: {version}"
-        raise RuntimeError(msg)
-
-    def _get_nn(self) -> float | ma.MaskedArray:
-        nn1 = self._getvar("nn1", "NN1")
-        median_nn1 = ma.median(nn1)
-        # Parameters taken from the matlab code and should be verified
-        if 120 < median_nn1 < 160:
-            step_factor, reference, scale = 1.24, 140, 5
-        elif 3200 < median_nn1 < 4000:
-            step_factor, reference, scale = 1.035, 3685, 1
-        else:
-            logging.warning("Unable to compute normalized APD")
-            return 1
-        return step_factor ** (-(nn1 - reference) / scale)
-
-    def _getvar(self, *args: str) -> float | ma.MaskedArray:
-        if self.dataset is None:
-            msg = "No dataset found"
-            raise RuntimeError(msg)
-        for arg in args:
-            if arg in self.dataset.variables:
-                var = self.dataset.variables[arg]
-                return var[0] if utils.isscalar(var) else var[:]
-        msg = f"Unable to find variable {args[0]}"
-        raise ValueError(msg)
-
-    def _fetch_attributes(self) -> None:
-        self.serial_number = getattr(self.dataset, "device_name", None)
-        if self.serial_number is None:
-            self.serial_number = getattr(self.dataset, "source", "")
-        self.instrument = (
-            instruments.CHM15KX
-            if self.serial_number.startswith("CHX")
-            else instruments.CHM15K
-        )