cloudnetpy 1.47.0__py3-none-any.whl → 1.47.2__py3-none-any.whl

cloudnetpy/instruments/disdrometer/parsivel.py

@@ -1,6 +1,6 @@
 import datetime
 import logging
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Iterator, Sequence
 from pathlib import Path
 from typing import Any, Literal, TypeVar
 
@@ -21,7 +21,7 @@ def parsivel2nc(
     site_meta: dict,
     uuid: str | None = None,
     date: str | datetime.date | None = None,
-    telegram: list[int] | None = None,
+    telegram: Sequence[int | None] | None = None,
 ) -> str:
     """Converts OTT Parsivel-2 disdrometer data into Cloudnet Level 1b netCDF
     file.
@@ -34,8 +34,9 @@ def parsivel2nc(
         uuid: Set specific UUID for the file.
         date: Expected date of the measurements as YYYY-MM-DD.
         telegram: List of measured value numbers as specified in section 11.2 of
-            the instrument's operating instructions. Must be defined if the
-            input file doesn't contain a header.
+            the instrument's operating instructions. Unknown values are indicated
+            with None. Telegram is required if the input file doesn't contain a
+            header.
 
     Returns:
         UUID of the generated file.
@@ -69,7 +70,7 @@ class Parsivel(CloudnetInstrument):
         self,
         filename: Path | str | bytes,
         site_meta: dict,
-        telegram: list[int] | None = None,
+        telegram: Sequence[int | None] | None = None,
         expected_date: datetime.date | None = None,
     ):
         super().__init__()
@@ -204,6 +205,9 @@ TELEGRAM = {
     16: "I_heating",
     17: "V_power_supply",
     18: "state_sensor",
+    19: "_datetime",
+    20: "_time",
+    21: "_date",
     22: "_station_name",
     24: "_rain_amount_absolute",
     25: "error_code",
@@ -231,12 +235,19 @@ def _parse_int(tokens: Iterator[str]) -> int:
 
 
 def _parse_float(tokens: Iterator[str]) -> float:
-    return float(next(tokens))
+    token = next(tokens)
+    token = token.replace(",", ".")
+    return float(token)
 
 
 def _parse_date(tokens: Iterator[str]) -> datetime.date:
     token = next(tokens)
-    year, month, day = token.split("/")
+    if "/" in token:
+        year, month, day = token.split("/")
+    elif "." in token:
+        day, month, year = token.split(".")
+    else:
+        raise ValueError(f"Unsupported date: '{input}'")
     if len(year) != 4:
         raise ValueError(f"Unsupported date: '{input}'")
     return datetime.date(int(year), int(month), int(day))
@@ -260,8 +271,7 @@ def _parse_datetime(tokens: Iterator[str]) -> datetime.datetime:
 
 
 def _parse_vector(tokens: Iterator[str]) -> np.ndarray:
-    values = [float(x) for x in _take(tokens, 32)]
-    return np.array(values)
+    return np.array([_parse_float(tokens) for _i in range(32)])
 
 
 def _parse_spectrum(tokens: Iterator[str]) -> np.ndarray:
@@ -285,14 +295,8 @@ PARSERS: dict[str, Callable[[Iterator[str]], Any]] = {
     "T_sensor": _parse_int,
     "V_power_supply": _parse_float,
     "_date": _parse_date,
-    "_dsp_firmware_version": next,
-    "_iop_firmware_version": next,
-    "_metar": next,
-    "_nws": next,
     "_rain_accum": _parse_float,
     "_rain_amount_absolute": _parse_float,
-    "_sensor_id": next,
-    "_station_name": next,
     "_time": _parse_time,
     "error_code": _parse_int,
     "fall_velocity": _parse_vector,
@@ -300,7 +304,7 @@ PARSERS: dict[str, Callable[[Iterator[str]], Any]] = {
     "kinetic_energy": _parse_float,
     "n_particles": _parse_int,
     "number_concentration": _parse_vector,
-    "time": _parse_datetime,
+    "_datetime": _parse_datetime,
     "radar_reflectivity": _parse_float,
     "rainfall_rate": _parse_float,
     "sig_laser": _parse_int,
@@ -316,8 +320,11 @@ def _parse_headers(line: str) -> list[str]:
     return [HEADERS[header.strip()] for header in line.split(";")]
 
 
-def _parse_telegram(telegram: list[int]) -> list[str]:
-    return ["time"] + [TELEGRAM[header] for header in telegram]
+def _parse_telegram(telegram: Sequence[int | None]) -> list[str]:
+    return [
+        TELEGRAM[num] if num is not None else f"_unknown_{i}"
+        for i, num in enumerate(telegram)
+    ]
 
 
 def _read_rows(headers: list[str], rows: list[str]) -> dict[str, list]:
@@ -328,7 +335,7 @@ def _read_rows(headers: list[str], rows: list[str]) -> dict[str, list]:
             continue
         try:
             tokens = iter(row.removesuffix(";").split(";"))
-            parsed = [PARSERS[header](tokens) for header in headers]
+            parsed = [PARSERS.get(header, next)(tokens) for header in headers]
             unread_tokens = list(tokens)
             if unread_tokens:
                 raise ValueError("More values than expected")
@@ -345,7 +352,7 @@ def _read_rows(headers: list[str], rows: list[str]) -> dict[str, list]:
 
 
 def _read_parsivel(
-    filename: Path | str | bytes, telegram: list[int] | None = None
+    filename: Path | str | bytes, telegram: Sequence[int | None] | None = None
 ) -> dict[str, np.ndarray]:
     with open(filename, encoding="latin1", errors="ignore") as file:
         lines = file.read().splitlines()
@@ -354,17 +361,16 @@ def _read_parsivel(
     if "Date" in lines[0]:
         headers = _parse_headers(lines[0])
         data = _read_rows(headers, lines[1:])
-        data["time"] = [
-            datetime.datetime.combine(date, time)
-            for date, time in zip(data["_date"], data["_time"])
-        ]
-        del data["_date"]
-        del data["_time"]
     elif telegram is not None:
         headers = _parse_telegram(telegram)
         data = _read_rows(headers, lines)
     else:
         raise ValueError("telegram must be specified for files without header")
+    if "_datetime" not in data:
+        data["_datetime"] = [
+            datetime.datetime.combine(date, time)
+            for date, time in zip(data["_date"], data["_time"])
+        ]
     result = {key: np.array(value) for key, value in data.items()}
-    result["time"] = result["time"].astype("datetime64[s]")
+    result["time"] = result["_datetime"].astype("datetime64[s]")
     return result

cloudnetpy/instruments/lufft.py

@@ -12,6 +12,8 @@ from cloudnetpy.instruments.nc_lidar import NcLidar
 class LufftCeilo(NcLidar):
     """Class for Lufft chm15k ceilometer."""
 
+    serial_number: str | None
+
     def __init__(
         self, file_name: str, site_meta: dict, expected_date: str | None = None
     ):
@@ -19,12 +21,13 @@ class LufftCeilo(NcLidar):
         self.file_name = file_name
         self.site_meta = site_meta
         self.expected_date = expected_date
-        self.instrument = self._get_chm_model()
+        self.serial_number = None
 
     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()
@@ -77,9 +80,12 @@ class LufftCeilo(NcLidar):
                 return var[0] if utils.isscalar(var) else var[:]
         raise ValueError("Unknown variable")
 
-    def _get_chm_model(self):
-        with netCDF4.Dataset(self.file_name) as nc:
-            source = getattr(nc, "source", "")[:3].lower()
-            if source == "chx":
-                return instruments.CHM15KX
-        return instruments.CHM15K
+    def _fetch_attributes(self):
+        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
+        )

cloudnetpy/version.py

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

{cloudnetpy-1.47.0.dist-info → cloudnetpy-1.47.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.47.0
+Version: 1.47.2
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.47.0.dist-info → cloudnetpy-1.47.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=4stvQT5oxNdxu6Bh7NbT5LH65CIpzhfGA_Cey5Ai6m4,5022
 cloudnetpy/output.py,sha256=Oaj5w_C8rIFQrt2i9WZtvOjliBZgHo9Rm-HO1n6wazQ,13071
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=Rsh_ojLNMH5ps7fWLKvF74Xd9B1yC9JqL507eRljyDQ,26973
-cloudnetpy/version.py,sha256=67sm74BYbuFFYHeq-EL-buEgbFD_IQ9vSQKZtLPNhC4,72
+cloudnetpy/version.py,sha256=a1VwkoLwSdAt59hSaL7yzIODKVJxnFcS6tSnZws2z64,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=-Z1y1Eaju7pG2yOIgUeIf-xH21HRxzWfJ9AOIrVL4A8,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=6WdfGqzOvnaDW7vlMMrZBJIxW_eHQdjH-Xl_iPv1TTI,3716
@@ -34,7 +34,7 @@ cloudnetpy/instruments/copernicus.py,sha256=FDS7Rsunp4ieTPFh_T_LXvreNi5_HTv4ZzR3
 cloudnetpy/instruments/galileo.py,sha256=F_XyoAb9PR-ifGhqhXziKnv0KfyOh-yEBaE1NgRMzNg,4318
 cloudnetpy/instruments/hatpro.py,sha256=ftXVbYx2xtQcRZ2zVF82jUP7R96YV5Wdgcz_PUNZTXM,4824
 cloudnetpy/instruments/instruments.py,sha256=FGiN0369--1z8uYzgDP9_1A7DFLL_Cl4-Ca-OMsjBdI,2824
-cloudnetpy/instruments/lufft.py,sha256=o6sY1L82EgfaBXBwFpomHmIz37cP8WHu0WDoiUROvyQ,3226
+cloudnetpy/instruments/lufft.py,sha256=E2qzvya206gNiML7BSM6vm1lzeOMBePrIuPT81NHPvw,3397
 cloudnetpy/instruments/mira.py,sha256=wtcgTR_nqL_BPZ5yqvBYXpI9Qtwdvc_1v6N_r3hCEPc,4888
 cloudnetpy/instruments/nc_lidar.py,sha256=9FSsInEM8fdyyhgNXb2INBjb5OEGFE5ZaVSowHjzoCA,1386
 cloudnetpy/instruments/nc_radar.py,sha256=hjmtgLuBPnfsyRInOZeKzAw3oZ82WSumrlPpycqBbjk,5530
@@ -46,7 +46,7 @@ cloudnetpy/instruments/vaisala.py,sha256=wOziQs_NuPTcZm8fg0UH9HCslhBCWromyxulQgS
 cloudnetpy/instruments/weather_station.py,sha256=gwPh4opv8SDf_vi4yBq5oHe8IFxGUF7ktB5yOBerd1g,5829
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=_IWuhRtFIiYdIUjnS9R715C4eyr0dGd96ZDvQWJYetc,15006
-cloudnetpy/instruments/disdrometer/parsivel.py,sha256=EIq61eZIU4RyTGIN4caQieGfVhbsFE77fbGk9JL0u7I,12552
+cloudnetpy/instruments/disdrometer/parsivel.py,sha256=_AGqOl2_vC927MJ2vn9xArHZDw0kWhUKxxxusCyv4CY,12821
 cloudnetpy/instruments/disdrometer/thies.py,sha256=YB328052yqlkOW7sGZSfUUCwLS3GPzYrWDiSg8C3C-s,5022
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=xYEkCsgwpF1kQNkG3ydxGM6DjFd-tryZ9ULlA9HUIAE,6321
@@ -103,8 +103,8 @@ cloudnetpy/products/lwc.py,sha256=CqvV7iqxUbk2YekaocBActmZuhF1BhWkfc-y6MDej-0,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/product_tools.py,sha256=9eKvr-zGEK2ARN2DmJN--KbynKdT08DhfT1GB8Rfoe4,9616
 docs/source/conf.py,sha256=baQlgkkUGJi4952W6NRhLkIBbRtwFgqrIOBuEeSCLfk,1488
-cloudnetpy-1.47.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.47.0.dist-info/METADATA,sha256=Z2SzijgI_f7RfaPHEty3pJmqnZ1VZdNv7Cc6fHEzOq8,5638
-cloudnetpy-1.47.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cloudnetpy-1.47.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.47.0.dist-info/RECORD,,
+cloudnetpy-1.47.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.47.2.dist-info/METADATA,sha256=TdlQti8TZ1wKHHG1coPydiB7fUkj2MrRIDFfSGjXE44,5638
+cloudnetpy-1.47.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+cloudnetpy-1.47.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.47.2.dist-info/RECORD,,