cloudnetpy 1.51.1__tar.gz → 1.52.0__tar.gz

{cloudnetpy-1.51.1/cloudnetpy.egg-info → cloudnetpy-1.52.0}/PKG-INFO

@@ -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

{cloudnetpy-1.51.1 → cloudnetpy-1.52.0}/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-1.51.1 → cloudnetpy-1.52.0}/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-1.51.1 → cloudnetpy-1.52.0}/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-1.51.1 → cloudnetpy-1.52.0}/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-1.51.1 → cloudnetpy-1.52.0}/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-1.51.1 → cloudnetpy-1.52.0}/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 → cloudnetpy-1.52.0/cloudnetpy.egg-info}/PKG-INFO

@@ -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

{cloudnetpy-1.51.1 → cloudnetpy-1.52.0}/cloudnetpy.egg-info/requires.txt

@@ -1,6 +1,6 @@
 cloudnetpy_qc>=1.10.2
 matplotlib
-mwrpy>=0.1.6
+mwrpy>=0.4.1
 netCDF4
 requests
 rpgpy>=0.14.2

{cloudnetpy-1.51.1 → cloudnetpy-1.52.0}/pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
 dependencies = [
   "cloudnetpy_qc>=1.10.2",
   "matplotlib",
-  "mwrpy>=0.1.6",
+  "mwrpy>=0.4.1",
   "netCDF4",
   "requests",
   "rpgpy>=0.14.2",