cloudnetpy 1.66.12__py3-none-any.whl → 1.66.13__py3-none-any.whl

cloudnetpy/instruments/radiometrics.py

@@ -4,6 +4,7 @@ import csv
 import datetime
 import logging
 import os
+import re
 from operator import attrgetter
 from typing import Any, NamedTuple
 
@@ -11,8 +12,9 @@ import numpy as np
 
 from cloudnetpy import output, utils
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
+from cloudnetpy.metadata import MetaData
 
 
 def radiometrics2nc(
@@ -65,7 +67,7 @@ def radiometrics2nc(
     if radiometrics.date is None:
         msg = "Failed to find valid timestamps from Radiometrics file(s)."
         raise ValidTimeStampError(msg)
-    attributes = output.add_time_attribute({}, radiometrics.date)
+    attributes = output.add_time_attribute(ATTRIBUTES, radiometrics.date)
     output.update_attributes(radiometrics.data, attributes)
     return output.save_level1b(radiometrics, output_file, uuid)
 
@@ -91,6 +93,7 @@ class Radiometrics:
         self.raw_data: list[Record] = []
         self.data: dict = {}
         self.instrument = instruments.RADIOMETRICS
+        self.ranges: list[str] = []
 
     def read_raw_data(self) -> None:
         """Reads Radiometrics raw data."""
@@ -98,14 +101,21 @@ class Radiometrics:
         unknown_record_types = set()
         rows = []
         with open(self.filename, encoding="utf8") as infile:
-            reader = csv.reader(infile)
+            reader = csv.reader(infile, skipinitialspace=True)
             for row in reader:
                 if row[0] == "Record":
                     if row[1] != "Date/Time":
                         msg = "Unexpected header in Radiometrics file"
                         raise RuntimeError(msg)
                     record_type = int(row[2])
-                    record_columns[record_type] = row[3:]
+                    columns = row[3:]
+                    record_columns[record_type] = columns
+                    if record_type in (10, 400):
+                        self.ranges = [
+                            column
+                            for column in columns
+                            if re.fullmatch(r"\d+\.\d+", column)
+                        ]
                 else:
                     record_type = int(row[2])
                     block_type = record_type // 10 * 10
@@ -125,33 +135,64 @@ class Radiometrics:
                     )
                     rows.append(record)
 
-        # The rows should be in sequence but sort them just to be sure.
-        rows.sort(key=attrgetter("row_number"))
-
-        for data_row in rows:
-            # Use the first row of a block and skip the rest which should
-            # contain the same values in the first columns.
-            if data_row.block_index == 0:
-                self.raw_data.append(data_row)
+        self.raw_data = sorted(rows, key=attrgetter("row_number"))
 
     def read_data(self) -> None:
         """Reads values."""
         times = []
         lwps = []
         iwvs = []
+        irts = []
+        temps = []
+        rhs = []
+        ahs = []
+        block_titles = {}
         for record in self.raw_data:
-            lwp = record.values.get("Lqint(mm)", record.values.get("Int. Liquid(mm)"))
-            iwv = record.values.get("Vint(cm)", record.values.get("Int. Vapor(cm)"))
-            if lwp is None and iwv is None:
-                continue
-            times.append(record.timestamp)
-            if lwp is not None:
-                lwps.append(float(lwp))  # mm => kg m-2
-            if iwv is not None:
-                iwvs.append(float(iwv) * 10)  # cm => kg m-2
+            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):
+                if title == "Temperature (K)":
+                    temps.append(
+                        [float(record.values[column]) for column in self.ranges]
+                    )
+                elif title == "Relative Humidity (%)":
+                    rhs.append([float(record.values[column]) for column in self.ranges])
+                elif title == "Vapor Density (g/m^3)":
+                    ahs.append([float(record.values[column]) for column in self.ranges])
+            elif record.block_type == 10:
+                if record.block_index == 0:
+                    lwp = record.values["Lqint(mm)"]
+                    iwv = record.values["Vint(cm)"]
+                    irt = record.values["Tir(K)"]
+                    times.append(record.timestamp)
+                    lwps.append(float(lwp))
+                    iwvs.append(float(iwv))
+                    irts.append([float(irt)])
+                    temps.append(
+                        [float(record.values[column]) for column in self.ranges]
+                    )
+                elif record.block_index == 1:
+                    ahs.append([float(record.values[column]) for column in self.ranges])
+                elif record.block_index == 2:
+                    rhs.append([float(record.values[column]) for column in self.ranges])
+            elif record.block_type == 200:
+                irt = record.values["Tir(K)"]
+                irts.append([float(irt)])
+            elif record.block_type == 300:
+                lwp = record.values["Int. Liquid(mm)"]
+                iwv = record.values["Int. Vapor(cm)"]
+                times.append(record.timestamp)
+                lwps.append(float(lwp))
+                iwvs.append(float(iwv))
         self.data["time"] = np.array(times, dtype="datetime64[s]")
-        self.data["lwp"] = np.array(lwps, dtype=float)
-        self.data["iwv"] = np.array(iwvs, dtype=float)
+        self.data["lwp"] = np.array(lwps)  # mm => kg m-2
+        self.data["iwv"] = np.array(iwvs) * 10  # cm => kg m-2
+        self.data["irt"] = np.array(irts)
+        self.data["temperature"] = np.array(temps)
+        self.data["relative_humidity"] = np.array(rhs) / 100  # % => 1
+        self.data["absolute_humidity"] = np.array(ahs) / 1000  # g m-3 => kg m-3
 
 
 class RadiometricsCombined:
@@ -165,8 +206,14 @@ class RadiometricsCombined:
         self.data = {}
         self.date = None
         for obj in objs:
+            if obj.ranges != objs[0].ranges:
+                msg = "Inconsistent range between files"
+                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"]
         self.instrument = instruments.RADIOMETRICS
 
     def screen_time(self, expected_date: datetime.date | None) -> None:
@@ -179,6 +226,8 @@ class RadiometricsCombined:
         if np.count_nonzero(valid_mask) == 0:
             raise ValidTimeStampError
         for key in self.data:
+            if key in ("range", "height"):
+                continue
             self.data[key] = self.data[key][valid_mask]
 
     def time_to_fractional_hours(self) -> None:
@@ -188,7 +237,12 @@ class RadiometricsCombined:
     def data_to_cloudnet_arrays(self) -> None:
         """Converts arrays to CloudnetArrays."""
         for key, array in self.data.items():
-            self.data[key] = CloudnetArray(array, key)
+            dimensions = (
+                ("time", "range")
+                if key in ("temperature", "relative_humidity", "absolute_humidity")
+                else None
+            )
+            self.data[key] = CloudnetArray(array, key, dimensions=dimensions)
 
     def add_meta(self) -> None:
         """Adds some metadata."""
@@ -213,3 +267,11 @@ def _parse_datetime(text: str) -> datetime.datetime:
         minute,
         second,
     )
+
+
+ATTRIBUTES = {
+    "irt": MetaData(
+        long_name="Infrared brightness temperatures",
+        units="K",
+    ),
+}

cloudnetpy/metadata.py

@@ -144,6 +144,11 @@ COMMON_ATTRIBUTES = {
         standard_name="relative_humidity",
         units="1",
     ),
+    "absolute_humidity": MetaData(
+        long_name="Absolute humidity",
+        standard_name="mass_concentration_of_water_vapor_in_air",
+        units="kg m-3",
+    ),
     "wind_speed": MetaData(
         long_name="Wind speed",
         standard_name="wind_speed",

cloudnetpy/plotting/plot_meta.py

@@ -137,6 +137,25 @@ ATTRIBUTES = {
             plot_range=(0, 50 / 3600000),
         )
     },
+    "mwr": {
+        "temperature": PlotMeta(
+            cmap="coolwarm",
+            plot_range=(223.15, 323.15),
+            contour=True,
+            time_smoothing_duration=_MWR_SINGLE_SMOOTHING,
+        ),
+        "relative_humidity": PlotMeta(
+            plot_range=(0, 120),
+            contour=True,
+            time_smoothing_duration=_MWR_SINGLE_SMOOTHING,
+        ),
+        "absolute_humidity": PlotMeta(
+            plot_range=(1e-4, 1e-2),
+            log_scale=True,
+            contour=True,
+            time_smoothing_duration=_MWR_SINGLE_SMOOTHING,
+        ),
+    },
     "mwr-single": {
         "temperature": PlotMeta(
             cmap="coolwarm",

cloudnetpy/plotting/plotting.py

@@ -627,13 +627,15 @@ class Plot1D(Plot):
             label = "Freq"
             value = figure_data.file.variables["frequency"][freq_ind]
             unit = "GHz"
-        else:
+        elif "ir_wavelength" in figure_data.file.variables:
             label = "WL"
             variable = figure_data.file.variables["ir_wavelength"]
             # `ir_wavelength` is scalar in old files
             value = variable[:] if len(variable.shape) == 0 else variable[freq_ind]
             value /= 1e-6  # m to μm
             unit = "μm"
+        else:
+            return
         self._ax.text(
             0.0,
             -0.13,

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 66
-PATCH = 12
+PATCH = 13
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.66.12.dist-info → cloudnetpy-1.66.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.66.12
+Version: 1.66.13
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -75,7 +75,7 @@ classified as ice, liquid, aerosol, insects, and so on.
 Subsequently, geophysical products such as ice water content can be
 retrieved in further processing steps. See [Illingworth et al. (2007)](https://doi.org/10.1175/BAMS-88-6-883) for more details about the concept.
 
-CloudnetPy is a rewritten version of the original Cloudnet Matlab code. It features several revised methods, extensive documentation, and more.
+CloudnetPy is a rewritten version of the original Cloudnet MATLAB code. It features several revised methods, extensive documentation, and more.
 
 - CloudnetPy documentation: <https://actris-cloudnet.github.io/cloudnetpy/>
 - Cloudnet data portal: <https://cloudnet.fmi.fi>
@@ -84,13 +84,13 @@ CloudnetPy is a rewritten version of the original Cloudnet Matlab code. It featu
 
 ## Installation
 
-### From PyPI
+### Option 1: From PyPI
 
 ```
 python3 -m pip install cloudnetpy
 ```
 
-### From the source
+### Option 2: From the source
 
 ```sh
 git clone https://github.com/actris-cloudnet/cloudnetpy
@@ -101,6 +101,14 @@ python3 -m pip install --upgrade pip
 python3 -m pip install .
 ```
 
+## Verification
+
+To verify the installation:
+
+```sh
+cloudnetpy --help
+```
+
 ## Citing
 
 If you wish to acknowledge CloudnetPy in your publication, please cite:
@@ -123,12 +131,7 @@ pre-commit install
 Run unit tests:
 
 ```sh
-python3 -m pytest --flake-finder --flake-runs=2
-```
-
-Run single unit test:
-
-```sh
+python3 -m pytest
 python3 -m pytest tests/unit/test_hatpro.py
 ```
 
@@ -136,9 +139,6 @@ Run end-to-end tests:
 
 ```sh
 python3 tests/e2e_test.py
-```
-
-```sh
 for f in cloudnetpy/model_evaluation/tests/e2e/*/main.py; do $f; done
 ```
 

{cloudnetpy-1.66.12.dist-info → cloudnetpy-1.66.13.dist-info}/RECORD

@@ -5,11 +5,11 @@ cloudnetpy/concat_lib.py,sha256=RiL6fgaKjX2YyXl0BonbCjLXV2voIKPcQcdR9ZkQ8QA,1188
 cloudnetpy/constants.py,sha256=RDB9aqpBRztk3QVCFgsmi9fwhtLuit_0WJrt0D6sDcc,736
 cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
 cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
-cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
+cloudnetpy/metadata.py,sha256=DOGt7EQLS-AVJEszrUrpXr3gHVQv655FzeCzKrOPvoU,5477
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JksYOwf9ORiR_QpoKrTe1JJwXpPYJj-wlwaZKCHoh3o,29744
-cloudnetpy/version.py,sha256=hDP4BM9G04Ifg9QoprxFNbcmG2SmWWByNxAAuXOyoDg,73
+cloudnetpy/version.py,sha256=e037Rt3zV1cUMxgFOwb_aKwQpz6AqErxFNOUMI-uF4k,73
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 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=ctmb0tJHkRoz-Ic8UAw4_v4VfS27r22_4X_1s4mUAas,6990
 cloudnetpy/instruments/pollyxt.py,sha256=YuVEHr-BX31rtVOFsWGU-SQFAmcxpXL26eyCVMz_9hw,8933
-cloudnetpy/instruments/radiometrics.py,sha256=ECN_bSfcV8Evdgfho9-Dl8RThXkAhHzIEj4DPOawSTc,7626
+cloudnetpy/instruments/radiometrics.py,sha256=7LeqfW3YTDOfhTV48hiGofBWw5_qlHjd-Lsjd9WDYho,10393
 cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
@@ -100,8 +100,8 @@ cloudnetpy/model_evaluation/tests/unit/test_plotting.py,sha256=h9V8JKmrO4v9bOvv-
 cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V0qbqkpDuaTYvEIbaasl0nZ5gmTLR4eGC0glBQ,9724
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=Ia_VrLdV2NstX5gbx_3AZTOAlrgLAy_xFZ8fHYVX0xI,3817
 cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV6Y,107
-cloudnetpy/plotting/plot_meta.py,sha256=ZvaKU3eXy1KFxQomnsEu3mCYpwwBYKAYk7oAwOzAGSg,16143
-cloudnetpy/plotting/plotting.py,sha256=RGtRMfrZ6wFsFCXZ540I18a7p_O0x3S7FGIAoyuyOxw,35425
+cloudnetpy/plotting/plot_meta.py,sha256=d7CIT4ltUsjKw0HNnOXPkaLdZbkSmTuq6AbKdbODfZE,16730
+cloudnetpy/plotting/plotting.py,sha256=ufFKChNK9Z6uRRBtMLT5AvZiyWiakPLGgC9OHWaC8Z0,35504
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=KwAiBSgFwDqhM114NIgYiUjj8HoYc7gAlc8E1QgcSig,8207
 cloudnetpy/products/der.py,sha256=soypE7uSEP4uHUCCQVEhyXsKY6e9mzV9B_2S5GUizqk,12729
@@ -115,9 +115,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.12.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.12.dist-info/METADATA,sha256=D2tfe8TI2gBUjDEXvdYb3pICu6pJtoxcGQ0zuvhVXGg,5785
-cloudnetpy-1.66.12.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-cloudnetpy-1.66.12.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.66.12.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.12.dist-info/RECORD,,
+cloudnetpy-1.66.13.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.13.dist-info/METADATA,sha256=aySMKfVCWVBn0lC2BmrMk5akY14h2NlTe_WXUfjsMbw,5805
+cloudnetpy-1.66.13.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+cloudnetpy-1.66.13.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.66.13.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.13.dist-info/RECORD,,