cloudnetpy 1.74.3__tar.gz → 1.75.0__tar.gz

{cloudnetpy-1.74.3/cloudnetpy.egg-info → cloudnetpy-1.75.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.74.3
+Version: 1.75.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -41,7 +41,7 @@ License-File: LICENSE
 Requires-Dist: ceilopyter
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=1.2.0
+Requires-Dist: mwrpy>=1.3.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/instruments/hatpro.py

@@ -4,6 +4,7 @@ import datetime
 import logging
 from collections import defaultdict
 from pathlib import Path
+from typing import Literal
 
 import netCDF4
 import numpy as np
@@ -17,7 +18,7 @@ from cloudnetpy import output, utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import HatproDataError, ValidTimeStampError
 from cloudnetpy.instruments import rpg
-from cloudnetpy.instruments.instruments import HATPRO
+from cloudnetpy.instruments.instruments import HATPRO, LHATPRO, LHUMPRO_U90, Instrument
 from cloudnetpy.instruments.rpg_reader import (
     HatproBin,
     HatproBinCombined,
@@ -25,11 +26,19 @@ from cloudnetpy.instruments.rpg_reader import (
     HatproBinLwp,
 )
 
+IType = Literal["hatpro", "lhatpro", "lhumpro_u90"]
+ITYPE_MAP: dict[IType, Instrument] = {
+    "hatpro": HATPRO,
+    "lhatpro": LHATPRO,
+    "lhumpro_u90": LHUMPRO_U90,
+}
+
 
 def hatpro2l1c(
     mwr_dir: str,
     output_file: str,
     site_meta: dict,
+    instrument_type: IType = "hatpro",
     uuid: str | None = None,
     date: datetime.date | str | None = None,
 ) -> str:
@@ -39,6 +48,7 @@ def hatpro2l1c(
         mwr_dir: Folder containing one day of HATPRO files.
         output_file: Output file name.
         site_meta: Dictionary containing information about the site and instrument
+        instrument_type: Specific type of the RPG microwave radiometer.
         uuid: Set specific UUID for the file.
         date: Expected date in the input files.
 
@@ -55,6 +65,7 @@ def hatpro2l1c(
         hatpro_raw = lev1_to_nc(
             "1C01",
             mwr_dir,
+            instrument_type=instrument_type,
             output_file=output_file,
             coeff_files=coeff_files,
             instrument_config=site_meta,
@@ -64,7 +75,7 @@ def hatpro2l1c(
     except MissingInputData as err:
         raise HatproDataError(str(err)) from err
 
-    hatpro = HatproL1c(hatpro_raw, site_meta)
+    hatpro = HatproL1c(hatpro_raw, site_meta, ITYPE_MAP[instrument_type])
 
     flags = hatpro.data["quality_flag"][:]
     bad_percentage = ma.sum(flags != 0) / flags.size * 100
@@ -123,18 +134,19 @@ def hatpro2l1c(
 
 
 class HatproL1c:
-    def __init__(self, hatpro, site_meta: dict):
+    def __init__(self, hatpro, site_meta: dict, instrument: Instrument):
         self.raw_data = hatpro.raw_data
         self.data = hatpro.data
         self.date = hatpro.date.isoformat().split("-")
         self.site_meta = site_meta
-        self.instrument = HATPRO
+        self.instrument = instrument
 
 
 def hatpro2nc(
     path_to_files: str,
     output_file: str,
     site_meta: dict,
+    instrument_type: IType = "hatpro",
     uuid: str | None = None,
     date: str | None = None,
 ) -> tuple[str, list]:
@@ -154,6 +166,7 @@ def hatpro2nc(
             - `latitude` (optional).
             - `longitude` (optional).
 
+        instrument_type: Specific type of the RPG microwave radiometer.
         uuid: Set specific UUID for the file.
         date: Expected date in the input files. If not set,
             all files will be used. This might cause unexpected behavior if
@@ -183,7 +196,7 @@ def hatpro2nc(
     if is_iwv_files:
         _add_missing_variables(hatpro_objects, ("lwp", "iwv"))
     one_day_of_data = rpg.create_one_day_data_record(hatpro_objects)
-    hatpro = rpg.Hatpro(one_day_of_data, site_meta)
+    hatpro = rpg.Hatpro(one_day_of_data, site_meta, ITYPE_MAP[instrument_type])
     hatpro.add_site_geolocation()
     hatpro.convert_time_to_fraction_hour("float64")
     hatpro.sort_timestamps()

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/instruments/instruments.py

@@ -137,6 +137,20 @@ HATPRO = Instrument(
     model="HATPRO",
 )
 
+LHATPRO = Instrument(
+    manufacturer="RPG-Radiometer Physics",
+    domain="mwr",
+    category="microwave radiometer",
+    model="LHATPRO",
+)
+
+LHUMPRO_U90 = Instrument(
+    manufacturer="RPG-Radiometer Physics",
+    domain="mwr",
+    category="microwave radiometer",
+    model="LHUMPRO-U90",
+)
+
 RADIOMETRICS = Instrument(
     manufacturer="Radiometrics",
     domain="mwr",

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/instruments/rpg.py

@@ -3,7 +3,6 @@
 import logging
 import math
 from collections.abc import Sequence
-from typing import TYPE_CHECKING
 
 import numpy as np
 from numpy import ma
@@ -15,12 +14,10 @@ from cloudnetpy.constants import G_TO_KG, HPA_TO_PA, KM_H_TO_M_S, MM_H_TO_M_S
 from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
+from cloudnetpy.instruments.instruments import Instrument
 from cloudnetpy.instruments.rpg_reader import Fmcw94Bin, HatproBinCombined
 from cloudnetpy.metadata import MetaData
 
-if TYPE_CHECKING:
-    from cloudnetpy.instruments.instruments import Instrument
-
 
 def rpg2nc(
     path_to_l1_files: str,
@@ -331,9 +328,9 @@ class Fmcw(Rpg):
 class Hatpro(Rpg):
     """Class for RPG HATPRO mwr."""
 
-    def __init__(self, raw_data: dict, site_properties: dict):
+    def __init__(self, raw_data: dict, site_properties: dict, instrument: Instrument):
         super().__init__(raw_data, site_properties)
-        self.instrument = instruments.HATPRO
+        self.instrument = instrument
 
 
 def _filter_zenith_angle(zenith: ma.MaskedArray) -> np.ndarray:

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/plotting/plotting.py

@@ -199,7 +199,7 @@ class FigureData:
                 if "altitude" not in self.file.variables:
                     msg = "No altitude information in the file."
                     raise ValueError(msg)
-                height -= np.median(self.file.variables["altitude"][:])
+                height -= ma.median(self.file.variables["altitude"][:])
             return height * con.M_TO_KM
         if "range" in self.file.variables:
             return self.file.variables["range"][:] * con.M_TO_KM
@@ -848,7 +848,7 @@ class Plot1D(Plot):
             return np.array([])
         if len(data) == 1:
             return data
-        time_delta_hours = np.median(np.diff(time))
+        time_delta_hours = ma.median(np.diff(time))
         window_size = int(window / 60 / time_delta_hours)
         if window_size < 1:
             window_size = 1

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/products/__init__.py

@@ -4,4 +4,4 @@ from .drizzle import generate_drizzle
 from .ier import generate_ier
 from .iwc import generate_iwc
 from .lwc import generate_lwc
-from .mwr_tools import generate_mwr_multi, generate_mwr_single
+from .mwr_tools import generate_mwr_lhumpro, generate_mwr_multi, generate_mwr_single

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/products/mwr_tools.py

@@ -1,10 +1,11 @@
 import os
 import tempfile
-from typing import Literal
+from typing import TYPE_CHECKING, Literal
 
 import netCDF4
 import numpy as np
 import requests
+from mwrpy.level2.lev2_collocated import generate_lev2_lhumpro as gen_lhumpro
 from mwrpy.level2.lev2_collocated import generate_lev2_multi as gen_multi
 from mwrpy.level2.lev2_collocated import generate_lev2_single as gen_single
 from mwrpy.level2.write_lev2_nc import MissingInputData
@@ -13,6 +14,9 @@ from mwrpy.version import __version__ as mwrpy_version
 from cloudnetpy import output, utils
 from cloudnetpy.exceptions import ValidTimeStampError
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 
 def generate_mwr_single(
     mwr_l1c_file: str, output_file: str, uuid: str | None = None
@@ -34,6 +38,26 @@ def generate_mwr_single(
     return _generate_product(mwr_l1c_file, output_file, uuid, "single")
 
 
+def generate_mwr_lhumpro(
+    mwr_l1c_file: str, output_file: str, uuid: str | None = None
+) -> str:
+    """Generates LHUMPRO single-pointing product including liquid water path, integrated
+    water vapor, etc. from zenith measurements.
+
+    Args:
+        mwr_l1c_file: The Level 1C MWR file to be processed.
+        output_file: The file path where the output file should be saved.
+        uuid: The UUID, if any, associated with the output file. Defaults to None.
+
+    Returns:
+        UUID of generated file.
+
+    Example:
+        >>> generate_mwr_lhumpro('input_mwr_l1c_file', 'output_file', 'abcdefg1234567')
+    """
+    return _generate_product(mwr_l1c_file, output_file, uuid, "lhumpro")
+
+
 def generate_mwr_multi(
     mwr_l1c_file: str, output_file: str, uuid: str | None = None
 ) -> str:
@@ -56,9 +80,19 @@ def _generate_product(
     mwr_l1c_file: str,
     output_file: str,
     uuid: str | None,
-    product: Literal["multi", "single"],
+    product: Literal["multi", "single", "lhumpro"],
 ) -> str:
-    fun = gen_multi if product == "multi" else gen_single
+    fun: Callable
+    if product == "multi":
+        fun = gen_multi
+    elif product == "single":
+        fun = gen_single
+    elif product == "lhumpro":
+        fun = gen_lhumpro
+        product = "single"
+    else:
+        msg = f"Invalid product: {product}"
+        raise ValueError(msg)
     with tempfile.TemporaryDirectory() as temp_dir:
         coeffs = _read_mwrpy_coeffs(mwr_l1c_file, temp_dir)
         try:

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy/version.py

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

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.74.3
+Version: 1.75.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -41,7 +41,7 @@ License-File: LICENSE
 Requires-Dist: ceilopyter
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy>=1.2.0
+Requires-Dist: mwrpy>=1.3.0
 Requires-Dist: netCDF4
 Requires-Dist: requests
 Requires-Dist: rpgpy>=0.14.5

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/cloudnetpy.egg-info/requires.txt

@@ -1,7 +1,7 @@
 ceilopyter
 doppy>=0.5.0
 matplotlib
-mwrpy>=1.2.0
+mwrpy>=1.3.0
 netCDF4
 requests
 rpgpy>=0.14.5

{cloudnetpy-1.74.3 → cloudnetpy-1.75.0}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
   "ceilopyter",
   "doppy>=0.5.0",
   "matplotlib",
-  "mwrpy>=1.2.0",
+  "mwrpy>=1.3.0",
   "netCDF4",
   "requests",
   "rpgpy>=0.14.5",