cloudnetpy 1.81.1__py3-none-any.whl → 1.82.0__py3-none-any.whl

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/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/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/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.dist-info → cloudnetpy-1.82.0.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.82.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=CFpXmdEkVPzvLPv2xHIR-aMMQ-TR26KfESYw-98j7sk,7213
 cloudnetpy/output.py,sha256=bUp13wv5TVtfZ-wBPU_n2qvWZa-PviozrVUhJnonbYE,14830
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=7PHfJo9iLMdePwEApLfYH4XiVC9DhlFQMdQTxesZylA,31797
-cloudnetpy/version.py,sha256=chZph3CTTre3rPSQC__At9-AeitrZwYJ91usZPqrzko,72
+cloudnetpy/version.py,sha256=go0Zq4vIkrnCH45JYO1gxm5LNSQAgp0clDMvI3GQL7g,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -33,7 +33,7 @@ cloudnetpy/categorize/attenuations/liquid_attenuation.py,sha256=bmqmPk_93J4njE16
 cloudnetpy/categorize/attenuations/melting_attenuation.py,sha256=AHmMMK7upxtps5fXF7Ca_ZF8fwpzaTGyGSwXDJq6q1k,2387
 cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=wJPyCiKWzsQDzMhqbA7mYwj9YRVcJIpXWhBnEYFy3uU,2843
 cloudnetpy/instruments/__init__.py,sha256=PEgrrQNoiOuN_ctYilmt4LV2QCLg1likPjJdWtuGlLs,528
-cloudnetpy/instruments/basta.py,sha256=E_qT5g_lzFVk3v-U0hVwgcNYlc9mhgrAv1NnSg2jwG4,4163
+cloudnetpy/instruments/basta.py,sha256=N-kRgl5Vm52pXzr9umo4YsA0hn4zZCOa-0_zZTzhheY,4284
 cloudnetpy/instruments/bowtie.py,sha256=WZYB_o90I5QKOupCRjzZU4Mi54oX_3teyAPBDUogwRI,4301
 cloudnetpy/instruments/ceilo.py,sha256=GJ1ZVX6aEMAZw1cpTXcNy9imfuPAkoqmrLQyUc00UEo,8809
 cloudnetpy/instruments/ceilometer.py,sha256=c37uteeuGnlE-o-Smu49H2qQJw6qZ0tc3Bzhyr1FoSo,13063
@@ -42,7 +42,7 @@ cloudnetpy/instruments/cloudnet_instrument.py,sha256=B1UkiB0ytnT3MWYalEegql5QIPa
 cloudnetpy/instruments/copernicus.py,sha256=ygEViERBSJdMeP9OxfLelZRDEbSRzY8n17ruYie2wm4,6970
 cloudnetpy/instruments/fd12p.py,sha256=5TFyNO26VGpO4ts9UIJiuLo4LUwQPHO6aK2fTnOtaKY,7019
 cloudnetpy/instruments/galileo.py,sha256=f_-GkRxhNaQPbI8HpOwSmoKfGqyjmD16A0ZFgwLOIig,5137
-cloudnetpy/instruments/hatpro.py,sha256=omwZ0M_BqZ7rK1As9DOhTe5X9Bh3coMk2Qjlgr7b8cs,9906
+cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIoj3I,10248
 cloudnetpy/instruments/instruments.py,sha256=z8Osjww3iQRxKvzXdISl-5vV6gShtji8Db5k-ZzDQ-0,4843
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
 cloudnetpy/instruments/mira.py,sha256=XqmbytpeCJ2-hNugxdsXSBUDB8SAUc97_6lo5mHFG8E,11840
@@ -115,12 +115,12 @@ cloudnetpy/products/ier.py,sha256=Eb5AK-6l5mN_7vWP1cxcXQzj886zAwDDsHXueUju0N0,62
 cloudnetpy/products/iwc.py,sha256=pXl0xOFDD6AzGaAp_GzD2yapjOc7hXKTno9Q5G6HCOo,9826
 cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19339
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
-cloudnetpy/products/mwr_tools.py,sha256=ZIpeeH3qYPrujmITMtnS8H8PfQIPWJYlz4AdaUSSs28,6452
+cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.81.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.82.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.81.1.dist-info/METADATA,sha256=2SO_QdrF7uw6WKEYy7CmgnEdNWkc9nxY9JLr_L1Dgq4,5836
-cloudnetpy-1.81.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.81.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.81.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.81.1.dist-info/RECORD,,
+cloudnetpy-1.82.0.dist-info/METADATA,sha256=psXUo1YNPF33S6X7i1WnEGuaMY5V1XZlYJTguJl9-0I,5836
+cloudnetpy-1.82.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.82.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.82.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.82.0.dist-info/RECORD,,