cloudnetpy 1.81.1__tar.gz → 1.82.0__tar.gz

{cloudnetpy-1.81.1/cloudnetpy.egg-info → cloudnetpy-1.82.0}/PKG-INFO

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

{cloudnetpy-1.81.1 → cloudnetpy-1.82.0}/cloudnetpy/instruments/basta.py

@@ -102,9 +102,11 @@ class Basta(NcRadar):
     def validate_date(self, expected_date: datetime.date) -> None:
         """Validates expected data."""
         date_units = self.dataset.variables["time"].units
-        date = date_units.split()[2]
+        date_str = date_units.split()[2]
+        date = datetime.date.fromisoformat(date_str)
         if expected_date != date:
-            raise ValidTimeStampError
+            msg = "Time units doesn't match expected date"
+            raise ValidTimeStampError(msg)
 
     def add_zenith_angle(self) -> None:
         elevation = self.getvar("elevation")

{cloudnetpy-1.81.1 → cloudnetpy-1.82.0}/cloudnetpy/instruments/hatpro.py

@@ -42,6 +42,7 @@ def hatpro2l1c(
     output_file: str | PathLike,
     site_meta: dict,
     instrument_type: IType = "hatpro",
+    lidar_file: str | PathLike | None = None,
     uuid: str | UUID | None = None,
     date: str | datetime.date | None = None,
 ) -> UUID:
@@ -52,6 +53,7 @@ def hatpro2l1c(
         output_file: Output file name.
         site_meta: Dictionary containing information about the site and instrument
         instrument_type: Specific type of the RPG microwave radiometer.
+        lidar_file: Path to a lidar file.
         uuid: Set specific UUID for the file.
         date: Expected date in the input files.
 
@@ -71,6 +73,7 @@ def hatpro2l1c(
             str(mwr_dir),
             instrument_type=instrument_type,
             output_file=str(output_file),
+            lidar_path=lidar_file,
             coeff_files=coeff_files,
             instrument_config=site_meta,
             date=date,
@@ -133,7 +136,10 @@ def hatpro2l1c(
         nc.mwrpy_version = mwrpy_version
         nc.mwrpy_coefficients = ", ".join(site_meta["coefficientLinks"])
         nc.history = nc.history.replace("mwr", "mwr-l1c")
-
+        if lidar_file is not None:
+            with netCDF4.Dataset(lidar_file) as lidar_nc:
+                nc.source = f"{nc.source}\n{lidar_nc.source}"
+                nc.history = f"{nc.history}\n{lidar_nc.history}"
     return uuid
 
 

{cloudnetpy-1.81.1 → cloudnetpy-1.82.0}/cloudnetpy/products/mwr_tools.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 from os import PathLike
-from typing import TYPE_CHECKING, Literal
+from typing import Literal
 from uuid import UUID
 
 import netCDF4
@@ -16,14 +16,12 @@ 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 | PathLike,
     output_file: str | PathLike,
     uuid: str | UUID | None = None,
+    lwp_offset: tuple[float | None, float | None] = (None, None),
 ) -> UUID:
     """Generates MWR single-pointing product including liquid water path, integrated
     water vapor, etc. from zenith measurements.
@@ -32,6 +30,7 @@ def generate_mwr_single(
         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.
+        lwp_offset: Optional offset to apply to the liquid water path.
 
     Returns:
         UUID of generated file.
@@ -39,13 +38,14 @@ def generate_mwr_single(
     Example:
         >>> generate_mwr_single('input_mwr_l1c_file', 'output_file', 'abcdefg1234567')
     """
-    return _generate_product(mwr_l1c_file, output_file, uuid, "single")
+    return _generate_product(mwr_l1c_file, output_file, uuid, "single", lwp_offset)
 
 
 def generate_mwr_lhumpro(
     mwr_l1c_file: str | PathLike,
     output_file: str | PathLike,
     uuid: str | UUID | None = None,
+    lwp_offset: tuple[float | None, float | None] = (None, None),
 ) -> UUID:
     """Generates LHUMPRO single-pointing product including liquid water path, integrated
     water vapor, etc. from zenith measurements.
@@ -54,6 +54,7 @@ def generate_mwr_lhumpro(
         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.
+        lwp_offset: Optional offset to apply to the liquid water path.
 
     Returns:
         UUID of generated file.
@@ -61,7 +62,7 @@ def generate_mwr_lhumpro(
     Example:
         >>> generate_mwr_lhumpro('input_mwr_l1c_file', 'output_file', 'abcdefg1234567')
     """
-    return _generate_product(mwr_l1c_file, output_file, uuid, "lhumpro")
+    return _generate_product(mwr_l1c_file, output_file, uuid, "lhumpro", lwp_offset)
 
 
 def generate_mwr_multi(
@@ -88,24 +89,20 @@ def _generate_product(
     mwr_l1c_file: str | PathLike,
     output_file: str | PathLike,
     uuid: str | UUID | None,
-    product: Literal["multi", "single", "lhumpro"],
+    product: Literal["single", "multi", "lhumpro"],
+    lwp_offset: tuple[float | None, float | None] = (None, None),
 ) -> UUID:
     uuid = utils.get_uuid(uuid)
-    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:
-            fun(None, mwr_l1c_file, output_file, coeff_files=coeffs)
+            if product == "multi":
+                gen_multi(None, mwr_l1c_file, output_file, coeffs)
+            elif product == "single":
+                gen_single(None, mwr_l1c_file, output_file, lwp_offset, coeffs)
+            else:
+                gen_lhumpro(None, mwr_l1c_file, output_file, lwp_offset, coeffs)
+                product = "single"
         except MissingInputData as err:
             raise ValidTimeStampError from err
     with (

{cloudnetpy-1.81.1 → cloudnetpy-1.82.0}/cloudnetpy/version.py

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

{cloudnetpy-1.81.1 → cloudnetpy-1.82.0/cloudnetpy.egg-info}/PKG-INFO

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