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

cloudnetpy/instruments/mira.py

@@ -247,15 +247,15 @@ def _get_keymap(filetype: str) -> dict:
     keymaps = {
         "znc": OrderedDict(
             [
-                ("Zg", "Zh"),
+                ("Zg", "Zh"),  # fallback
                 ("Zh2l", "Zh"),
-                ("VELg", "v"),
+                ("VELg", "v"),  # fallback
                 ("VELh2l", "v"),
-                ("RMSg", "width"),
+                ("RMSg", "width"),  # fallback
                 ("RMSh2l", "width"),
-                ("LDRg", "ldr"),
+                ("LDRg", "ldr"),  # fallback
                 ("LDRh2l", "ldr"),
-                ("SNRg", "SNR"),
+                ("SNRg", "SNR"),  # fallback
                 ("SNRh2l", "SNR"),
                 ("elv", "elevation"),
                 ("azi", "azimuth_angle"),
@@ -265,20 +265,23 @@ def _get_keymap(filetype: str) -> dict:
                 ("rg0", "rg0"),
             ],
         ),
-        "mmclx": {
-            "Zg": "Zh",
-            "VELg": "v",
-            "RMSg": "width",
-            "LDRg": "ldr",
-            "SNRg": "SNR",
-            "elv": "elevation",
-            "azi": "azimuth_angle",
-            "nfft": "nfft",
-            "nave": "nave",
-            "prf": "prf",
-            "rg0": "rg0",
-            "NyquistVelocity": "NyquistVelocity",  # variable in some mmclx files
-        },
+        "mmclx": OrderedDict(
+            [
+                ("Ze", "Zh"),  # fallback for old mmclx files
+                ("Zg", "Zh"),
+                ("VELg", "v"),
+                ("RMSg", "width"),
+                ("LDRg", "ldr"),
+                ("SNRg", "SNR"),
+                ("elv", "elevation"),
+                ("azi", "azimuth_angle"),
+                ("nfft", "nfft"),
+                ("nave", "nave"),
+                ("prf", "prf"),
+                ("rg0", "rg0"),
+                ("NyquistVelocity", "NyquistVelocity"),  # variable in some mmclx files
+            ]
+        ),
     }
 
     return keymaps.get(filetype.lower(), keymaps["mmclx"])

cloudnetpy/instruments/radiometrics.py

@@ -6,6 +6,7 @@ import logging
 import os
 import re
 from operator import attrgetter
+from pathlib import Path
 from typing import Any, NamedTuple
 
 import numpy as np
@@ -18,8 +19,8 @@ from cloudnetpy.metadata import MetaData
 
 
 def radiometrics2nc(
-    full_path: str,
-    output_file: str,
+    full_path: str | os.PathLike,
+    output_file: str | os.PathLike,
     site_meta: dict,
     uuid: str | None = None,
     date: str | datetime.date | None = None,
@@ -46,19 +47,11 @@ def radiometrics2nc(
     """
     if isinstance(date, str):
         date = datetime.date.fromisoformat(date)
-
     if os.path.isdir(full_path):
-        valid_filenames = utils.get_sorted_filenames(full_path, ".csv")
+        valid_filenames = list(Path(full_path).iterdir())
     else:
-        valid_filenames = [full_path]
-
-    objs = []
-    for filename in valid_filenames:
-        obj = Radiometrics(filename)
-        obj.read_raw_data()
-        obj.read_data()
-        objs.append(obj)
-
+        valid_filenames = [Path(full_path)]
+    objs = [_read_file(filename) for filename in valid_filenames]
     radiometrics = RadiometricsCombined(objs, site_meta)
     radiometrics.screen_time(date)
     radiometrics.sort_timestamps()
@@ -81,15 +74,16 @@ class Record(NamedTuple):
     values: dict[str, Any]
 
 
-class Radiometrics:
-    """Reader for level 2 files of Radiometrics microwave radiometers.
+class RadiometricsMP:
+    """Reader for level 2 files (*.csv) from Radiometrics MP-3000A and similar
+    microwave radiometers.
 
     References:
         Radiometrics (2008). Profiler Operator's Manual: MP-3000A, MP-2500A,
         MP-1500A, MP-183A.
     """
 
-    def __init__(self, filename: str):
+    def __init__(self, filename: Path):
         self.filename = filename
         self.raw_data: list[Record] = []
         self.data: dict = {}
@@ -152,12 +146,19 @@ class Radiometrics:
         ahs = []
         ah_times = []
         block_titles = {}
+        skip_procs = set()
         for record in self.raw_data:
             if record.block_type == 100:
                 block_type = int(record.values["Record Type"]) - 1
                 title = record.values["Title"]
                 block_titles[block_type] = title
             if title := block_titles.get(record.block_type + record.block_index):
+                # "LV2 Processor" values "Zenith" and "0.00:90.00" should be OK
+                # but "Angle20(N)" and similar should be skipped.
+                proc = record.values["LV2 Processor"]
+                if proc.startswith("Angle"):
+                    skip_procs.add(proc)
+                    continue
                 if title == "Temperature (K)":
                     temp_times.append(record.timestamp)
                     temps.append(
@@ -194,6 +195,9 @@ class Radiometrics:
                 irt = record.values["Tir(K)"]
                 irts.append([float(irt)])
             elif record.block_type == 300:
+                if skip_procs:
+                    skip_procs.pop()
+                    continue
                 lwp = record.values["Int. Liquid(mm)"]
                 iwv = record.values["Int. Vapor(cm)"]
                 times.append(record.timestamp)
@@ -224,13 +228,69 @@ class Radiometrics:
         )
 
 
+class RadiometricsWVR:
+    """Reader for *.los files from Radiometrics WVR-1100 microwave
+    radiometer.
+    """
+
+    def __init__(self, filename: Path):
+        self.filename = filename
+        self.raw_data: dict = {}
+        self.data: dict = {}
+        self.instrument = instruments.RADIOMETRICS
+        self.ranges: list[str] = []
+
+    def read_raw_data(self) -> None:
+        with open(self.filename, encoding="utf8") as infile:
+            for line in infile:
+                columns = line.split()
+                if columns[:2] == ["date", "time"]:
+                    headers = columns
+                    break
+            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)
+                    else:
+                        parsed_value = float(value)
+                    self.raw_data[key].append(parsed_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
+                )
+            ],
+            dtype="datetime64[s]",
+        )
+        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
+        for key in self.data:
+            self.data[key] = self.data[key][is_zenith]
+
+
 class RadiometricsCombined:
     site_meta: dict
     data: dict
     date: datetime.date | None
     instrument: instruments.Instrument
 
-    def __init__(self, objs: list[Radiometrics], site_meta: dict):
+    def __init__(self, objs: list[RadiometricsMP | RadiometricsWVR], site_meta: dict):
         self.site_meta = site_meta
         self.data = {}
         self.date = None
@@ -240,9 +300,10 @@ class RadiometricsCombined:
                 raise InconsistentDataError(msg)
             for key in obj.data:
                 self.data = utils.append_data(self.data, key, obj.data[key])
-        ranges = [float(x) for x in objs[0].ranges]
-        self.data["range"] = np.array(ranges) * 1000  # m => km
-        self.data["height"] = self.data["range"] + self.site_meta["altitude"]
+        if objs[0].ranges:
+            ranges = [float(x) for x in objs[0].ranges]
+            self.data["range"] = np.array(ranges) * 1000  # m => km
+            self.data["height"] = self.data["range"] + self.site_meta["altitude"]
         self.instrument = instruments.RADIOMETRICS
 
     def screen_time(self, expected_date: datetime.date | None) -> None:
@@ -289,6 +350,19 @@ class RadiometricsCombined:
                 self.data[name] = CloudnetArray(float(value), key)
 
 
+def _read_file(filename: Path) -> RadiometricsMP | RadiometricsWVR:
+    with open(filename) as f:
+        first_line = f.readline()
+    obj = (
+        RadiometricsWVR(filename)
+        if "RETRIEVAL COEFFICIENTS" in first_line
+        else RadiometricsMP(filename)
+    )
+    obj.read_raw_data()
+    obj.read_data()
+    return obj
+
+
 def _parse_datetime(text: str) -> datetime.datetime:
     date, time = text.split()
     month, day, year = map(int, date.split("/"))

cloudnetpy/utils.py

@@ -965,7 +965,8 @@ def get_files_with_common_range(filenames: list) -> list:
         with netCDF4.Dataset(file) as nc:
             n_range.append(len(nc.variables["range"]))
     most_common = np.bincount(n_range).argmax()
-    if n_removed := len(filenames) - n_range.count(int(most_common)) > 0:
+    n_removed = len(filenames) - n_range.count(int(most_common))
+    if n_removed > 0:
         logging.warning(
             "Removing %s files due to inconsistent height vector", n_removed
         )

cloudnetpy/version.py

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

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

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

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

@@ -8,8 +8,8 @@ cloudnetpy/exceptions.py,sha256=hYbUtBwjCIfxnPe_5mELDEw87AWITBrwuo7WYIEKmJ8,1579
 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=mzibw-RiC4e6rJGeJUf3RR_j-LmmcwqejzbacmXCmZA,33460
-cloudnetpy/version.py,sha256=2mtP3uOUUyCLGEPBZOTqdIlYgEriB62_Dv5irb5ckbI,72
+cloudnetpy/utils.py,sha256=SSZWk82c4nkAiTcLdOKGVvxt5ovETdAMn_TLxVeYpBY,33473
+cloudnetpy/version.py,sha256=vHHlyjedUCAOK4akFXnc6Xk6GWb-5gg4KD85wtoljYA,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
@@ -44,12 +44,12 @@ cloudnetpy/instruments/galileo.py,sha256=BjWE15_S3tTCOmAM5k--oicI3wghKaO0hv9EUBx
 cloudnetpy/instruments/hatpro.py,sha256=G1fHsY9LTos4vHP5kFubjE5Wg2uTVFZpYDSD8VAo-zw,9590
 cloudnetpy/instruments/instruments.py,sha256=hdELBl4zw9gZghXLjmUBmC_XnyGvNuOyaYZzSl9M17k,4704
 cloudnetpy/instruments/lufft.py,sha256=nIoEKuuFGKq2dLqkX7zW-HpAifefG472tZhKfXE1yoA,4212
-cloudnetpy/instruments/mira.py,sha256=Wofp8HbiAwJce_IbOLjpEFV07H_Kh4170C9Wygiz-ew,11401
+cloudnetpy/instruments/mira.py,sha256=IH88dnV5fdAQ-A04S23ROgNmT4GBAtzXQxCr_9fWj-Q,11634
 cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
 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=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
+cloudnetpy/instruments/radiometrics.py,sha256=__H7KFBcXT0FP8lis3P25MuMa5-S8GrTzKtazMKO678,14822
 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.75.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.76.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.75.0.dist-info/METADATA,sha256=DTNgu10C6RJgm06RyBCawO2SxeBlB_dTB_beAzd1NNM,5796
-cloudnetpy-1.75.0.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-cloudnetpy-1.75.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.75.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.75.0.dist-info/RECORD,,
+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.75.0.dist-info → cloudnetpy-1.76.0.dist-info}/WHEEL

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