cloudnetpy 1.76.0__py3-none-any.whl → 1.76.1__py3-none-any.whl

cloudnetpy/instruments/radiometrics.py

@@ -3,6 +3,7 @@
 import csv
 import datetime
 import logging
+import math
 import os
 import re
 from operator import attrgetter
@@ -206,26 +207,30 @@ class RadiometricsMP:
         self.data["time"] = np.array(times, dtype="datetime64[s]")
         self.data["lwp"] = np.array(lwps)  # mm => kg m-2
         self.data["iwv"] = np.array(iwvs) * 10  # cm => kg m-2
-        self.data["irt"] = _find_closest(
-            np.array(irt_times, dtype="datetime64[s]"),
-            np.array(irts),
-            self.data["time"],
-        )
-        self.data["temperature"] = _find_closest(
-            np.array(temp_times, dtype="datetime64[s]"),
-            np.array(temps),
-            self.data["time"],
-        )
-        self.data["relative_humidity"] = _find_closest(
-            np.array(rh_times, dtype="datetime64[s]"),
-            np.array(rhs) / 100,  # % => 1
-            self.data["time"],
-        )
-        self.data["absolute_humidity"] = _find_closest(
-            np.array(ah_times, dtype="datetime64[s]"),
-            np.array(ahs) / 1000,  # g m-3 => kg m-3
-            self.data["time"],
-        )
+        if irt_times:
+            self.data["irt"] = _find_closest(
+                np.array(irt_times, dtype="datetime64[s]"),
+                np.array(irts),
+                self.data["time"],
+            )
+        if temp_times:
+            self.data["temperature"] = _find_closest(
+                np.array(temp_times, dtype="datetime64[s]"),
+                np.array(temps),
+                self.data["time"],
+            )
+        if rh_times:
+            self.data["relative_humidity"] = _find_closest(
+                np.array(rh_times, dtype="datetime64[s]"),
+                np.array(rhs) / 100,  # % => 1
+                self.data["time"],
+            )
+        if ah_times:
+            self.data["absolute_humidity"] = _find_closest(
+                np.array(ah_times, dtype="datetime64[s]"),
+                np.array(ahs) / 1000,  # g m-3 => kg m-3
+                self.data["time"],
+            )
 
 
 class RadiometricsWVR:
@@ -241,8 +246,8 @@ class RadiometricsWVR:
         self.ranges: list[str] = []
 
     def read_raw_data(self) -> None:
-        with open(self.filename, encoding="utf8") as infile:
-            for line in infile:
+        with open(self.filename, encoding="utf8") as file:
+            for line in file:
                 columns = line.split()
                 if columns[:2] == ["date", "time"]:
                     headers = columns
@@ -250,29 +255,28 @@ class RadiometricsWVR:
             else:
                 msg = "No headers found"
                 raise RuntimeError(msg)
-            for key in headers:
-                self.raw_data[key] = []
-            for line in infile:
-                for key, value in zip(headers, line.split(), strict=False):
-                    parsed_value: Any
-                    if key == "date":
-                        month, day, year = map(int, value.split("/"))
-                        if year < 100:
-                            year += 2000
-                        parsed_value = datetime.date(year, month, day)
-                    elif key == "time":
-                        hour, minute, second = map(int, value.split(":"))
-                        parsed_value = datetime.time(hour, minute, second)
+            for header in headers:
+                self.raw_data[header] = []
+            for line in file:
+                columns = line.split()
+                if len(columns) != len(headers):
+                    continue
+                for header, column in zip(headers, columns, strict=True):
+                    value: datetime.date | datetime.time | float
+                    if header == "date":
+                        value = _parse_date(column)
+                    elif header == "time":
+                        value = _parse_time(column)
                     else:
-                        parsed_value = float(value)
-                    self.raw_data[key].append(parsed_value)
+                        value = _parse_value(column)
+                    self.raw_data[header].append(value)
 
     def read_data(self) -> None:
         self.data["time"] = np.array(
             [
                 datetime.datetime.combine(date, time)
                 for date, time in zip(
-                    self.raw_data["date"], self.raw_data["time"], strict=False
+                    self.raw_data["date"], self.raw_data["time"], strict=True
                 )
             ],
             dtype="datetime64[s]",
@@ -280,8 +284,11 @@ class RadiometricsWVR:
         self.data["lwp"] = np.array(self.raw_data["LiqCM"]) * 10  # cm => kg m-2
         self.data["iwv"] = np.array(self.raw_data["VapCM"]) * 10  # cm => kg m-2
         is_zenith = np.abs(np.array(self.raw_data["ELact"]) - 90.0) < 1.0
+        tb23_valid = np.array(self.raw_data["TbSky23"]) > 0
+        tb31_valid = np.array(self.raw_data["TbSky31"]) > 0
+        is_valid = is_zenith & tb23_valid & tb31_valid
         for key in self.data:
-            self.data[key] = self.data[key][is_zenith]
+            self.data[key] = self.data[key][is_valid]
 
 
 class RadiometricsCombined:
@@ -363,6 +370,22 @@ def _read_file(filename: Path) -> RadiometricsMP | RadiometricsWVR:
     return obj
 
 
+def _parse_value(text: str) -> float:
+    return math.nan if "*" in text else float(text)
+
+
+def _parse_date(text: str) -> datetime.date:
+    month, day, year = map(int, text.split("/"))
+    if year < 100:
+        year += 2000
+    return datetime.date(year, month, day)
+
+
+def _parse_time(text: str) -> datetime.time:
+    hour, minute, second = map(int, text.split(":"))
+    return datetime.time(hour, minute, second)
+
+
 def _parse_datetime(text: str) -> datetime.datetime:
     date, time = text.split()
     month, day, year = map(int, date.split("/"))

cloudnetpy/version.py

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

{cloudnetpy-1.76.0.dist-info → cloudnetpy-1.76.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.76.0
+Version: 1.76.1
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.76.0.dist-info → cloudnetpy-1.76.1.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=lO7BCbVAzFoH3Nq-VuezYX0f7MnbG1Zp11g5GSiuQwM,6189
 cloudnetpy/output.py,sha256=l0LoOhcGCBrg2EJ4NT1xZ7-UKWdV7X7yQ0fJmhkwJVc,15829
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=SSZWk82c4nkAiTcLdOKGVvxt5ovETdAMn_TLxVeYpBY,33473
-cloudnetpy/version.py,sha256=vHHlyjedUCAOK4akFXnc6Xk6GWb-5gg4KD85wtoljYA,72
+cloudnetpy/version.py,sha256=h_CrP8sn9JN6-YKTFNNaJcVYnr_Y-PGPAYa6HOR0wGo,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -49,7 +49,7 @@ cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
 cloudnetpy/instruments/nc_radar.py,sha256=HlaZeH5939R86ukF8K-P4Kfzb5-CpLB15LU2u94C5eI,7330
 cloudnetpy/instruments/pollyxt.py,sha256=U3g-ttmcs02LuLwVOydP3GjeNcmDyoYQroB-leIGdHY,10060
-cloudnetpy/instruments/radiometrics.py,sha256=__H7KFBcXT0FP8lis3P25MuMa5-S8GrTzKtazMKO678,14822
+cloudnetpy/instruments/radiometrics.py,sha256=_ZBHYiw3u4m0UDPaYRHnx-ofq2FS59Vdv3-fLiOzm9I,15471
 cloudnetpy/instruments/rain_e_h3.py,sha256=9TdpP4UzMBNIt2iE2GL6K9dFldzTHPLOrU8Q3tcosCU,5317
 cloudnetpy/instruments/rpg.py,sha256=m3-xLJ-w2T7Ip7jBveWsGrts4tmNvdc-Lb4HebvHQjQ,17319
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
@@ -116,10 +116,10 @@ cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=8HPZpQMTojKZP1JS1S83IE0sxmbDE9bxlaWoqmGnUZE,6199
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.76.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.76.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.76.0.dist-info/METADATA,sha256=sefr7DyZ7S4JNZcT_TvGj_b9hxEZOXJp887yXKW0tkg,5796
-cloudnetpy-1.76.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-cloudnetpy-1.76.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.76.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.76.0.dist-info/RECORD,,
+cloudnetpy-1.76.1.dist-info/METADATA,sha256=D879CAfuvaUbCF960Vvrb0Xiik6hijq1yiFREIFjZcE,5796
+cloudnetpy-1.76.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+cloudnetpy-1.76.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.76.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.76.1.dist-info/RECORD,,

{cloudnetpy-1.76.0.dist-info → cloudnetpy-1.76.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any