cloudnetpy 1.51.1__py3-none-any.whl → 1.52.0__py3-none-any.whl

cloudnetpy/instruments/hatpro.py

@@ -36,7 +36,7 @@ def hatpro2l1c(
     Args:
         mwr_dir: Folder containing one day of HATPRO files.
         output_file: Output file name.
-        site_meta: Dictionary containing information about the site
+        site_meta: Dictionary containing information about the site and instrument
         uuid: Set specific UUID for the file.
         date: Expected date in the input files.
 
@@ -44,7 +44,16 @@ def hatpro2l1c(
         UUID of the generated file.
     """
 
-    hatpro_raw = mwrpy.lev1_to_nc(site_meta["coeffs_dir"], "1C01", mwr_dir)
+    coeff_files = site_meta.get("coefficientFiles", None)
+
+    hatpro_raw = mwrpy.lev1_to_nc(
+        "1C01",
+        mwr_dir,
+        output_file=output_file,
+        coeff_files=coeff_files,
+        instrument_config=site_meta,
+    )
+
     hatpro = HatproL1c(hatpro_raw, site_meta)
 
     timestamps = hatpro.data["time"][:]
@@ -75,7 +84,7 @@ def hatpro2l1c(
         nc.cloudnet_file_type = "mwr-l1c"
         nc.title = nc.title.replace("radiometer", "radiometer Level 1c")
         nc.mwrpy_version = mwrpy_version
-        nc.mwrpy_coefficients = site_meta["coeffs_dir"]
+        nc.mwrpy_coefficients = ", ".join(site_meta["coefficientLinks"])
 
     return uuid
 

cloudnetpy/plotting/plotting.py

@@ -483,8 +483,7 @@ def _plot_disdrometer(ax, data: ndarray, time: ndarray, name: str, unit: str):
 
 def _plot_hatpro(ax, data: dict, full_path: str):
     tb = _pointing_filter(full_path, data["tb"])
-    time = _pointing_filter(full_path, data["time"])
-    ax.plot(time, tb, color="royalblue", linestyle="-", linewidth=1)
+    ax.plot(data["time"], tb, color="royalblue", linestyle="-", linewidth=1)
     set_ax(
         ax,
         max_y=np.max(tb) + 0.5,
@@ -493,36 +492,21 @@ def _plot_hatpro(ax, data: dict, full_path: str):
     )
 
 
-def _elevation_filter(full_path: str, data_field: ndarray, ele_range: tuple) -> ndarray:
-    """Filters data for specified range of elevation angles."""
-    with netCDF4.Dataset(full_path) as nc:
-        if "ele" in nc.variables:
-            elevation = ptools.read_nc_fields(full_path, "ele")
-            if data_field.ndim > 1:
-                data_field = data_field[
-                    (elevation >= ele_range[0]) & (elevation <= ele_range[1]), :
-                ]
-            else:
-                data_field = data_field[
-                    (elevation >= ele_range[0]) & (elevation <= ele_range[1])
-                ]
-    return data_field
-
-
 def _pointing_filter(
-    full_path: str, data_field: ndarray, ele_range: tuple = (0, 91), status: int = 0
+    full_path: str, data: ndarray, zenith_limit=5, status: int = 0
 ) -> ndarray:
-    """Filters data according to pointing flag."""
+    """Filters data according to pointing flag and zenith angle."""
     with netCDF4.Dataset(full_path) as nc:
         if "pointing_flag" in nc.variables:
             pointing = ptools.read_nc_fields(full_path, "pointing_flag")
-            assert isinstance(pointing, ndarray)
-            pointing_screened = _elevation_filter(full_path, pointing, ele_range)
-            if data_field.ndim > 1:
-                data_field = data_field[pointing_screened == status, :]
+            zenith_angle = ptools.read_nc_fields(full_path, "zenith_angle")
+            if data.ndim > 1:
+                data[np.abs(zenith_angle) > zenith_limit, :] = ma.masked
+                data[pointing != status, :] = ma.masked
             else:
-                data_field = data_field[pointing_screened == status]
-    return data_field
+                data[np.abs(zenith_angle) > zenith_limit] = ma.masked
+                data[pointing != status] = ma.masked
+    return data
 
 
 def _plot_weather_station(ax, data: ndarray, time: ndarray, name: str):

cloudnetpy/products/mwr_multi.py

@@ -1,3 +1,4 @@
+import tempfile
 from tempfile import NamedTemporaryFile
 
 import netCDF4
@@ -12,7 +13,6 @@ def generate_mwr_multi(
     mwr_l1c_file: str, output_file: str, uuid: str | None = None
 ) -> str:
     file_uuid = uuid if uuid is not None else utils.get_uuid()
-    coeffs = product_tools.get_mwrpy_coeffs(mwr_l1c_file)
 
     with (
         NamedTemporaryFile() as temp_file,
@@ -20,16 +20,19 @@ def generate_mwr_multi(
         NamedTemporaryFile() as rel_hum_file,
         NamedTemporaryFile() as t_pot_file,
         NamedTemporaryFile() as eq_temp_file,
+        tempfile.TemporaryDirectory() as temp_dir,
     ):
+        coeffs = product_tools.get_read_mwrpy_coeffs(mwr_l1c_file, temp_dir)
+
         for prod, file in zip(
             ("2P02", "2P03", "2P04", "2P07", "2P08"),
             (temp_file, abs_hum_file, rel_hum_file, t_pot_file, eq_temp_file),
         ):
             lev2_to_nc(
-                coeffs,
                 prod,
                 mwr_l1c_file,
                 file.name,
+                coeff_files=coeffs,
                 temp_file=temp_file.name if prod not in ("2P02", "2P03") else None,
                 hum_file=abs_hum_file.name if prod not in ("2P02", "2P03") else None,
             )

cloudnetpy/products/mwr_single.py

@@ -1,3 +1,4 @@
+import tempfile
 from tempfile import NamedTemporaryFile
 
 import netCDF4
@@ -12,19 +13,21 @@ def generate_mwr_single(
     mwr_l1c_file: str, output_file: str, uuid: str | None = None
 ) -> str:
     file_uuid = uuid if uuid is not None else utils.get_uuid()
-    coeffs = product_tools.get_mwrpy_coeffs(mwr_l1c_file)
 
     with (
         NamedTemporaryFile() as lwp_file,
         NamedTemporaryFile() as iwv_file,
         NamedTemporaryFile() as t_prof_file,
         NamedTemporaryFile() as abs_hum_file,
+        tempfile.TemporaryDirectory() as temp_dir,
     ):
+        coeffs = product_tools.get_read_mwrpy_coeffs(mwr_l1c_file, temp_dir)
+
         for prod, file in zip(
             ("2I01", "2I02", "2P01", "2P03"),
             (lwp_file, iwv_file, t_prof_file, abs_hum_file),
         ):
-            lev2_to_nc(coeffs, prod, mwr_l1c_file, file.name)
+            lev2_to_nc(prod, mwr_l1c_file, file.name, coeff_files=coeffs)
 
         with (
             netCDF4.Dataset(output_file, "w", format="NETCDF4_CLASSIC") as nc_output,

cloudnetpy/products/product_tools.py

@@ -1,8 +1,10 @@
 """General helper classes and functions for all products."""
+import os
 from collections import namedtuple
 
 import netCDF4
 import numpy as np
+import requests
 from numpy import ma
 
 from cloudnetpy import constants, utils
@@ -276,4 +278,14 @@ def get_temperature(categorize_file: str) -> np.ndarray:
 
 def get_mwrpy_coeffs(nc_file: str) -> str:
     with netCDF4.Dataset(nc_file) as nc:
-        return nc.mwrpy_coefficients
+        return nc.mwrpy_coefficients.split(", ")
+
+
+def get_read_mwrpy_coeffs(mwr_l1c_file, folder: str) -> list:
+    coeffs = []
+    for link in get_mwrpy_coeffs(mwr_l1c_file):
+        full_path = os.path.join(folder, link.split("/")[-1])
+        with open(full_path, "wb") as f:
+            f.write(requests.get(link, timeout=10).content)
+        coeffs.append(full_path)
+    return coeffs

cloudnetpy/version.py

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

{cloudnetpy-1.51.1.dist-info → cloudnetpy-1.52.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.51.1
+Version: 1.52.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -39,18 +39,18 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cloudnetpy-qc (>=1.10.2)
+Requires-Dist: cloudnetpy-qc >=1.10.2
 Requires-Dist: matplotlib
-Requires-Dist: mwrpy (>=0.1.6)
+Requires-Dist: mwrpy >=0.4.1
 Requires-Dist: netCDF4
 Requires-Dist: requests
-Requires-Dist: rpgpy (>=0.14.2)
+Requires-Dist: rpgpy >=0.14.2
 Requires-Dist: scikit-image
 Requires-Dist: scipy
 Provides-Extra: dev
 Requires-Dist: pre-commit ; extra == 'dev'
 Provides-Extra: extras
-Requires-Dist: voodoonet (>=0.1.1) ; extra == 'extras'
+Requires-Dist: voodoonet >=0.1.1 ; extra == 'extras'
 Provides-Extra: test
 Requires-Dist: mypy ; extra == 'test'
 Requires-Dist: pylint ; extra == 'test'

{cloudnetpy-1.51.1.dist-info → cloudnetpy-1.52.0.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=-oRmr4HWjG_-P8jOjdBYMgRkOYnJKr6jmGIF-38Tno8,5023
 cloudnetpy/output.py,sha256=6ysoCcrk_pS_fWhyQoJX29V403f7UOloFw0SZjHCwKk,14236
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=lKVPF7VpbX2IPXTztI8eJZm8rLne9IuhMngQXKP12vg,26971
-cloudnetpy/version.py,sha256=Ja1UYLGffo0QdnwJpi9wS24Icrb4a0cV3o2mFuzPACo,72
+cloudnetpy/version.py,sha256=umnfdBNz2LRH86t5ulPJADHW23wlT1a-rX-l2-1pqaQ,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=_8VU0UpzKh7ZFh3TbGs-g3SYMRsRIR5mio0PmP66O7o,12372
 cloudnetpy/categorize/atmos_utils.py,sha256=6WdfGqzOvnaDW7vlMMrZBJIxW_eHQdjH-Xl_iPv1TTI,3716
@@ -33,7 +33,7 @@ cloudnetpy/instruments/cl61d.py,sha256=jETxUIIjILZwkMx9YKG8pI7cUodNjVoc6dYCqaxW1
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=nnaOtJJotXzYdoMoYGKeLZ1MciDYBx7tqVBFKBQjKL0,3304
 cloudnetpy/instruments/copernicus.py,sha256=FDS7Rsunp4ieTPFh_T_LXvreNi5_HTv4ZzR3OnTcAX8,5013
 cloudnetpy/instruments/galileo.py,sha256=F_XyoAb9PR-ifGhqhXziKnv0KfyOh-yEBaE1NgRMzNg,4318
-cloudnetpy/instruments/hatpro.py,sha256=H0FgTIxIp3fl59nrTS9z8NyRX7ugkR32B2N1uwEOWtQ,7438
+cloudnetpy/instruments/hatpro.py,sha256=kPIjHrLzMvZj4QBw0DjEMv8hofBSHdLb8hLcLlj6bKs,7631
 cloudnetpy/instruments/instruments.py,sha256=x_YV4UG05lF-39Yr-K3h5OrxSqrsndpF1K-KM0VURI0,2975
 cloudnetpy/instruments/lufft.py,sha256=lZr_fz2vWQdPr4ZiWW7_wT7WlrMmPsQ2ko6MKygZv50,3332
 cloudnetpy/instruments/mira.py,sha256=5wmmJGYHVglxaCpSuL92WIisADRD-85k_jlsC9mKLgQ,5063
@@ -91,7 +91,7 @@ cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=CPbFwL
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=84b1TxMogC1hyACQol7xthOWNkYXp3oZJF4GFokEkd4,3630
 cloudnetpy/plotting/__init__.py,sha256=3bhBlLx8o_SjVyuPxgT7mfZ145pd5erwcCoVNuj2z48,62
 cloudnetpy/plotting/plot_meta.py,sha256=CrRCwh5-YxOrIe2bJXnL9akdUGi-amsUCCHc5VoHAL8,26217
-cloudnetpy/plotting/plotting.py,sha256=ynjzRm6o5yUO2YI5robhVyiOYaGN88hoxU_FkPfhRaY,28174
+cloudnetpy/plotting/plotting.py,sha256=Kj4Su_cq-znqAeDTUVBiWf1eilGYg00WX8zqetQ20lI,27523
 cloudnetpy/products/__init__.py,sha256=hGkngQT-YAC5cmDiHkSkQw2ZBrg0hN2z40Fizz0QU5Y,210
 cloudnetpy/products/classification.py,sha256=0Y5dEVDZFbq3UcFnyHomml5Au12SSMVznQTgAMyqh2I,7701
 cloudnetpy/products/der.py,sha256=zDehcsSCwDTADmxrK4Dmy5VcsrJmDbb-t_SiSU-C3M0,12241
@@ -102,12 +102,12 @@ cloudnetpy/products/ier.py,sha256=z0g0VKtnow9QlD492f6z1jPtslqvfmBBuITTrLYH3cI,77
 cloudnetpy/products/iwc.py,sha256=0sAGYcTGOJcVH3MxqGxuwxiUpiEG0NuPg49gPsI0wLo,10076
 cloudnetpy/products/lwc.py,sha256=8G8pJppEsLZjXOvX5xvXEqEVSCMZZLfIeOoAMX6Gnu8,18642
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
-cloudnetpy/products/mwr_multi.py,sha256=9dw5DqU9uae54SDk0Pjzp4EKtQrjo1DeP-Xx41NEF_g,2804
-cloudnetpy/products/mwr_single.py,sha256=tfUYvkVf_Hh1GcpBnjjE8T30EYzyYc07UuzGJCBME-8,2931
-cloudnetpy/products/product_tools.py,sha256=Gk5e4N1m071IIFT9dy9lUvcDICsMYx-pMEtcWTJ54nw,9739
+cloudnetpy/products/mwr_multi.py,sha256=DAehj30BjrkSvaEs1QrTN02lgHTdzSgP3E_vv35bvok,2903
+cloudnetpy/products/mwr_single.py,sha256=nKl9eenNQXqpdsSxyKrnpCeoXRBcQnpkbESVceOdnRw,3030
+cloudnetpy/products/product_tools.py,sha256=KLvQKRkPrzZXT4_mFh2O5oJ14kf6nEyYd0sCaWlR0gY,10119
 docs/source/conf.py,sha256=baQlgkkUGJi4952W6NRhLkIBbRtwFgqrIOBuEeSCLfk,1488
-cloudnetpy-1.51.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.51.1.dist-info/METADATA,sha256=OChqYA3XkBzKFCvDLrrw90sY85E-OC6Si8_KQJINPN8,5759
-cloudnetpy-1.51.1.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-cloudnetpy-1.51.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.51.1.dist-info/RECORD,,
+cloudnetpy-1.52.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.52.0.dist-info/METADATA,sha256=ZWYxghjfTvHgL8ke4sT5Lxg_Br6MuEhUD_0vGt9J6H0,5751
+cloudnetpy-1.52.0.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+cloudnetpy-1.52.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.52.0.dist-info/RECORD,,

{cloudnetpy-1.51.1.dist-info → cloudnetpy-1.52.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.0)
+Generator: bdist_wheel (0.41.1)
 Root-Is-Purelib: true
 Tag: py3-none-any