cloudnetpy 1.58.0__py3-none-any.whl → 1.58.1__py3-none-any.whl

cloudnetpy/instruments/disdrometer/parsivel.py

@@ -372,7 +372,10 @@ def _parse_spectrum(tokens: Iterator[str]) -> np.ndarray:
     return np.array(values, dtype="i2").reshape((32, 32))
 
 
-PARSERS: dict[str, Callable[[Iterator[str]], Any]] = {
+ParserType = Callable[[Iterator[str]], Any]
+
+
+PARSERS: dict[str, ParserType] = {
     "I_heating": _parse_float,
     "T_sensor": _parse_int,
     "_T_pcb": _parse_int,
@@ -401,6 +404,16 @@ PARSERS: dict[str, Callable[[Iterator[str]], Any]] = {
     "visibility": _parse_int,
 }
 
+EMPTY_VALUES: dict[ParserType, Any] = {
+    _parse_int: 0,
+    _parse_float: 0.0,
+    _parse_date: datetime.date(2000, 1, 1),
+    _parse_time: datetime.time(12, 0, 0),
+    _parse_datetime: datetime.datetime(2000, 1, 1),
+    _parse_vector: np.zeros(32, dtype=float),
+    _parse_spectrum: np.zeros((32, 32), dtype="i2"),
+}
+
 
 def _parse_headers(line: str) -> list[str]:
     return [CSV_HEADERS[header.strip()] for header in line.split(";")]
@@ -508,7 +521,7 @@ def _read_toa5(filename: str | PathLike) -> dict[str, list]:
         return data
 
 
-def _read_typ_op4a(lines: list[str]) -> dict[str, list]:
+def _read_typ_op4a(lines: list[str]) -> dict[str, Any]:
     """Read output of "CS/PA" command. The output starts with line "TYP OP4A"
     followed by one line per measured variable in format: <number>:<value>.
     Output ends with characters: <ETX><CR><LF><NUL>. Lines are separated by
@@ -527,7 +540,7 @@ def _read_typ_op4a(lines: list[str]) -> dict[str, list]:
             continue
         parser = PARSERS.get(varname, next)
         tokens = value.split(";")
-        data[varname] = [parser(iter(tokens))]
+        data[varname] = parser(iter(tokens))
     return data
 
 
@@ -538,15 +551,26 @@ def _read_fmi(content: str):
     - output of "CS/PA" command without non-printable characters at the end
     - "]\n"
     """
-    output: dict[str, Any] = defaultdict(list)
+    output: dict[str, list] = {"_datetime": []}
     for m in re.finditer(
         r"\[(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+) "
         r"(?P<hour>\d+):(?P<minute>\d+):(?P<second>\d+)"
         r"(?P<output>[^\]]*)\]",
         content,
     ):
-        for key, value in _read_typ_op4a(m["output"].splitlines()).items():
+        try:
+            record = _read_typ_op4a(m["output"].splitlines())
+        except ValueError:
+            continue
+
+        for key, value in record.items():
+            if key not in output:
+                output[key] = [None] * len(output["_datetime"])
             output[key].append(value)
+        for key in output:
+            if key not in record and key != "_datetime":
+                output[key].append(None)
+
         output["_datetime"].append(
             datetime.datetime(
                 int(m["year"]),
@@ -577,6 +601,7 @@ def _read_parsivel(
             data = _read_toa5(filename)
         elif "TYP OP4A" in lines[0]:
             data = _read_typ_op4a(lines)
+            data = {key: [value] for key, value in data.items()}
         elif "Date" in lines[0]:
             headers = _parse_headers(lines[0])
             data = _read_rows(headers, lines[1:])
@@ -597,6 +622,17 @@ def _read_parsivel(
             combined_data[key].extend(values)
     if timestamps is not None:
         combined_data["_datetime"] = list(timestamps)
-    result = {key: np.array(value) for key, value in combined_data.items()}
+    result = {}
+    for key, value in combined_data.items():
+        array = np.array(
+            [
+                x
+                if x is not None
+                else (EMPTY_VALUES[PARSERS[key]] if key in PARSERS else "")
+                for x in value
+            ]
+        )
+        mask = [np.full(array.shape[1:], x is None) for x in value]
+        result[key] = ma.array(array, mask=mask)
     result["time"] = result["_datetime"].astype("datetime64[s]")
     return result

cloudnetpy/version.py

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

{cloudnetpy-1.58.0.dist-info → cloudnetpy-1.58.1.dist-info}/METADATA

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

{cloudnetpy-1.58.0.dist-info → cloudnetpy-1.58.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=Bcu1a9UyUq61jomuZ0_6hYIOzf61e5qCXeiwLm46ikw,5040
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=XqM3W37Oj7sDo5sKL2WvA97PmZnS5J5o73R1isvo-0o,72
+cloudnetpy/version.py,sha256=ACE_5AEhiiFIDukxdKYlkIvBmsdfhExmwRoHxF3tRPs,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
@@ -49,7 +49,7 @@ cloudnetpy/instruments/vaisala.py,sha256=E6PaK26lHprqOJUCEDZPZQu83Qan9n_THudTFQM
 cloudnetpy/instruments/weather_station.py,sha256=IMJHGXfMhb4jJw_i66oGDCkeeRn3_eko8zVehu6Fte0,5970
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=TTsvWzhHg5tansTs47WB-7uuBRCZdjbFQMAyAQtFkSU,15636
-cloudnetpy/instruments/disdrometer/parsivel.py,sha256=myBHJw4VDPJErPlzAgwLoTjUQOGcvXdbvvy0MEjyGBc,21293
+cloudnetpy/instruments/disdrometer/parsivel.py,sha256=TWq8VgG8U75AJQfCX-V2y8qy-nO6dKMOGd2eG8-u7to,22342
 cloudnetpy/instruments/disdrometer/thies.py,sha256=h7EwZ9tn47UUMiYqDQ68vkXv4q0rEqX1ZeFXd7XJYNg,5050
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=oUGIblcEWLLv16YKUch-M5KA-dGRAcuHa-9anP3xtX4,6447
@@ -107,8 +107,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.58.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.58.0.dist-info/METADATA,sha256=4nf1luVgeUXnmfw4rzTUg4HPFKNKgBR0HXckc_OG7b8,5733
-cloudnetpy-1.58.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.58.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.58.0.dist-info/RECORD,,
+cloudnetpy-1.58.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.58.1.dist-info/METADATA,sha256=CqdJACjYG1_pszHVdzrrr6RZGJNO-YUvhSmrNEuBhz8,5733
+cloudnetpy-1.58.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cloudnetpy-1.58.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.58.1.dist-info/RECORD,,