cloudnetpy 1.65.3__py3-none-any.whl → 1.65.5__py3-none-any.whl

cloudnetpy/categorize/atmos_utils.py

@@ -1,13 +1,8 @@
-from typing import Final
-
 import numpy as np
 from numpy import ma
 
 import cloudnetpy.constants as con
 
-HPA_TO_P: Final = 100
-P_TO_HPA: Final = 0.01
-
 
 def calc_wet_bulb_temperature(model_data: dict) -> np.ndarray:
     """Returns wet bulb temperature.
@@ -80,7 +75,7 @@ def calc_saturation_vapor_pressure(temperature: np.ndarray) -> np.ndarray:
             + 0.42873e-3 * (10 ** (4.76955 * (1 - ratio)) - 1)
             + 0.78614
         )
-    ) * HPA_TO_P
+    ) * con.HPA_TO_PA
 
 
 def calc_psychrometric_constant(pressure: np.ndarray) -> np.ndarray:
@@ -114,7 +109,7 @@ def calc_dew_point_temperature(vapor_pressure: np.ndarray) -> np.ndarray:
     """
     vaisala_parameters_over_water = (6.116441, 7.591386, 240.7263)
     a, m, tn = vaisala_parameters_over_water
-    dew_point_celsius = tn / ((m / np.log10(vapor_pressure * P_TO_HPA / a)) - 1)
+    dew_point_celsius = tn / ((m / np.log10(vapor_pressure * con.PA_TO_HPA / a)) - 1)
     return c2k(dew_point_celsius)
 
 
@@ -126,8 +121,3 @@ def c2k(temp: np.ndarray) -> np.ndarray:
 def k2c(temp: np.ndarray) -> np.ndarray:
     """Converts Kelvins to Celsius."""
     return ma.array(temp) - 273.15
-
-
-def mmh2ms(data: np.ndarray) -> np.ndarray:
-    """Converts mm h-1 to m s-1."""
-    return data / con.SEC_IN_HOUR * con.MM_TO_M

cloudnetpy/constants.py

@@ -30,3 +30,6 @@ G_TO_KG: Final = 1e-3
 M_S_TO_MM_H: Final = SEC_IN_HOUR / MM_TO_M
 MM_H_TO_M_S: Final = 1 / M_S_TO_MM_H
 GHZ_TO_HZ: Final = 1e9
+HPA_TO_PA: Final = 100
+PA_TO_HPA: Final = 1 / HPA_TO_PA
+KM_H_TO_M_S: Final = 1000 / SEC_IN_HOUR

cloudnetpy/instruments/hatpro.py

@@ -56,7 +56,7 @@ def hatpro2l1c(
             instrument_config=site_meta,
         )
     except MissingInputData as err:
-        raise HatproDataError from err
+        raise HatproDataError(str(err)) from err
 
     hatpro = HatproL1c(hatpro_raw, site_meta)
 

cloudnetpy/instruments/rpg.py

@@ -10,9 +10,8 @@ from numpy import ma
 from rpgpy import RPGFileError
 
 from cloudnetpy import output, utils
-from cloudnetpy.categorize.atmos_utils import mmh2ms
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.constants import G_TO_KG
+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
@@ -307,8 +306,11 @@ class Fmcw(Rpg):
 
     def convert_units(self) -> None:
         """Converts units."""
-        self.data["rainfall_rate"].data = mmh2ms(self.data["rainfall_rate"].data)
+        self.data["rainfall_rate"].data = self.data["rainfall_rate"].data * MM_H_TO_M_S
         self.data["lwp"].data *= G_TO_KG
+        self.data["relative_humidity"].data /= 100
+        self.data["air_pressure"].data *= HPA_TO_PA
+        self.data["wind_speed"].data *= KM_H_TO_M_S
 
     @staticmethod
     def _get_instrument(data: dict):

cloudnetpy/instruments/rpg_reader.py

@@ -71,8 +71,8 @@ class Fmcw94Bin:
             "QF": "quality_flag",
             "RR": "rainfall_rate",
             "RelHum": "relative_humidity",
-            "EnvTemp": "temperature",
-            "BaroP": "pressure",
+            "EnvTemp": "air_temperature",
+            "BaroP": "air_pressure",
             "WS": "wind_speed",
             "WD": "wind_direction",
             "DDVolt": "voltage",

cloudnetpy/instruments/weather_station.py

@@ -8,7 +8,7 @@ from numpy import ma
 from cloudnetpy import output
 from cloudnetpy.categorize import atmos_utils
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.constants import MM_H_TO_M_S, SEC_IN_HOUR
+from cloudnetpy.constants import HPA_TO_PA, MM_H_TO_M_S, SEC_IN_HOUR
 from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
@@ -137,7 +137,7 @@ class WS(CloudnetInstrument):
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
 
     def convert_pressure(self) -> None:
-        self.data["air_pressure"].data = self.data["air_pressure"][:] * 100  # hPa to Pa
+        self.data["air_pressure"].data = self.data["air_pressure"][:] * HPA_TO_PA
 
     def normalize_rainfall_amount(self) -> None:
         if "rainfall_amount" in self.data:

cloudnetpy/plotting/plotting.py

@@ -678,29 +678,40 @@ class Plot1D(Plot):
     def _plot_moving_average(self, figure_data: FigureData) -> None:
         time = figure_data.time.copy()
         data = self._data_orig.copy()
-        good_values = ~ma.getmaskarray(data)
-        data = data[good_values]
-        time = time[good_values]
-        if self.sub_plot.variable.name == "wind_direction":
-            wind_speed = figure_data.file["wind_speed"][good_values]
-            sma = self._calculate_average_wind_direction(
-                wind_speed, data, time, window=15
-            )
-        else:
-            sma = self._calculate_moving_average(data, time, window=5)
-        gap_time = _get_max_gap_in_minutes(figure_data)
-        gaps = self._find_time_gap_indices(time, max_gap_min=gap_time)
-        if len(gaps) > 0:
-            sma[gaps] = np.nan
-        if len(sma) == len(time):
-            self._ax.plot(
-                time,
-                sma,
-                color="slateblue",
-                lw=2,
-                label="_nolegend_",
-                zorder=_get_zorder("mean_curve"),
-            )
+        flags = self._read_flagged_data(figure_data)
+        is_invalid = ma.getmaskarray(data)
+        if np.any(flags):
+            is_invalid |= flags
+
+        is_wind_direction = self.sub_plot.variable.name == "wind_direction"
+        if is_wind_direction:
+            data = np.stack([figure_data.file["wind_speed"], data])
+
+        block_ind = np.where(np.diff(is_invalid))[0] + 1
+        valid_time_blocks = np.split(time, block_ind)[is_invalid[0] :: 2]
+        valid_data_blocks = np.split(data, block_ind)[is_invalid[0] :: 2]
+
+        for time1, data1 in zip(valid_time_blocks, valid_data_blocks, strict=False):
+            if is_wind_direction:
+                sma = self._calculate_average_wind_direction(
+                    data1[0], data1[1], time1, window=15
+                )
+            else:
+                sma = self._calculate_moving_average(data1, time1, window=5)
+            gap_time = _get_max_gap_in_minutes(figure_data)
+            gaps = self._find_time_gap_indices(time1, max_gap_min=gap_time) + 1
+
+            for time2, data2 in zip(
+                np.split(time1, gaps), np.split(sma, gaps), strict=False
+            ):
+                self._ax.plot(
+                    time2,
+                    data2,
+                    color="slateblue",
+                    lw=2,
+                    label="_nolegend_",
+                    zorder=_get_zorder("mean_curve"),
+                )
 
     @staticmethod
     def _get_line_width(time: ndarray) -> float:
@@ -736,12 +747,11 @@ class Plot1D(Plot):
         window_size = int(window / 60 / time_delta_hours)
         if window_size < 1:
             window_size = 1
-        if (window_size % 2) != 0:
+        if window_size % 2 == 0:
             window_size += 1
-        weights = np.repeat(1.0, window_size) / window_size
-        sma = np.convolve(data, weights, "valid")
-        edge = window_size // 2
-        return np.pad(sma, (edge, edge - 1), mode="constant", constant_values=np.nan)
+        weights = np.repeat(1 / window_size, window_size)
+        padded_data = np.pad(data, window_size // 2, mode="edge")
+        return np.convolve(padded_data, weights, "valid")
 
     @classmethod
     def _calculate_average_wind_direction(

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 65
-PATCH = 3
+PATCH = 5
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.65.3.dist-info → cloudnetpy-1.65.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.65.3
+Version: 1.65.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.65.3.dist-info → cloudnetpy-1.65.5.dist-info}/RECORD

@@ -1,17 +1,17 @@
 cloudnetpy/__init__.py,sha256=X_FqY-4yg5GUj5Edo14SToLEos6JIsC3fN-v1FUgQoA,43
 cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7077
 cloudnetpy/concat_lib.py,sha256=8Ek059RMLAfbbXCkX90cgnhw_8ZpcDrxw1yPvwtuitU,9846
-cloudnetpy/constants.py,sha256=YVbi2porUnKIzO_PdGeH9pEO9gKa95vDcj6TBMSreoY,734
+cloudnetpy/constants.py,sha256=Kn95HXVMsKFo9Bu-UOYSBJuPEOjBR4JLaEXH0-MBpwk,830
 cloudnetpy/datasource.py,sha256=j7N4g59HPvOBWle-W9bOUF0BfRLgvR4zwOi_B50cI7Q,7921
 cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
 cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YkCaxVkG_Mt2hng_IVnhygHteV4UMKzKALkeFZwFJL8,14822
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JV0Fawnme1HoZgoiidV3eIzsn6vx0AEjBNmI1CcrBsA,28517
-cloudnetpy/version.py,sha256=CjyHHlEJsidNOYLdZ_v5A7dMKPgacxMaMkdY1AxSrrU,72
+cloudnetpy/version.py,sha256=7taBpMQJ9IcUdGe8zT3heZNDf-x-mFFQ3gSVNYJYWjw,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=vavMC_WQQyGH14eL4vAzKLKDDZt8tBrMYimztYHOjH8,12639
-cloudnetpy/categorize/atmos_utils.py,sha256=64uenj2uxj3P3Blaq_pBN1pBjcF-X4LYNt-uTOjvevg,3778
+cloudnetpy/categorize/atmos_utils.py,sha256=ns5ydiEN34Ng6mJiOBpxKBVDU2NXj6W3Q5IUynmNRYI,3586
 cloudnetpy/categorize/categorize.py,sha256=VcxSs22icYDG3R5x9jTX7uuSjPU8tyc5bIz0Zj5F9z0,18303
 cloudnetpy/categorize/classify.py,sha256=a-0bVCtynGfORnDGTsPuzqkuDeOOR_OMz5ai9NsMuic,9870
 cloudnetpy/categorize/containers.py,sha256=g3SQHoqlY1uJ8b-MG-BbW3oWz5IyacA8kJBeIPy_4EA,4859
@@ -34,7 +34,7 @@ cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoG
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
 cloudnetpy/instruments/galileo.py,sha256=yQBedd7dmDnwuWi1MtXOsg4-RyRx0uRAXumCY4YuH9k,4686
-cloudnetpy/instruments/hatpro.py,sha256=2lEblvJ9m7QniWH1OH7ycWtywYqY6X3ulE4dNuQp-Z8,8749
+cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
 cloudnetpy/instruments/instruments.py,sha256=jG5TYnZ8bdCZXnI303ZsaJBEdSKaIjKMbkGtnq6kQX0,3261
 cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
 cloudnetpy/instruments/mira.py,sha256=EyzEBTpWfDlgaspZVuIfaP4l73GYSVnSzEzBZc0lZNg,9333
@@ -43,11 +43,11 @@ cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wf
 cloudnetpy/instruments/nc_radar.py,sha256=7bKwIZZHM-RagW9AEdgldweaulfy9n61N3RH5fopTqo,6936
 cloudnetpy/instruments/pollyxt.py,sha256=YuVEHr-BX31rtVOFsWGU-SQFAmcxpXL26eyCVMz_9hw,8933
 cloudnetpy/instruments/radiometrics.py,sha256=ECN_bSfcV8Evdgfho9-Dl8RThXkAhHzIEj4DPOawSTc,7626
-cloudnetpy/instruments/rpg.py,sha256=siPmiyOGdB_OtlnIiP0PAt_cySnped0clLLGnyzw02o,17317
-cloudnetpy/instruments/rpg_reader.py,sha256=2eYu-tBd0QyreUKqJT726aIMbA29aIxXK-UJCkOXMLM,11356
+cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
+cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=GGuA_v4S7kR9yApSr1-d0ETzNj4ehEZ7-pD1-AdPYRE,14662
-cloudnetpy/instruments/weather_station.py,sha256=F5G_hbmkS4WgORS5oRVLxvKHuYBuef4MC_cZDu4lu_Y,17499
+cloudnetpy/instruments/weather_station.py,sha256=IJw3qdyXkJf10LOfxcpFqGNRN5ThgYfR8l764FVc9l4,17503
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=HJZrEysQkx9MiIVPDV25CYHpXi_SjgZlgO-otoaKK34,25640
@@ -94,7 +94,7 @@ cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V
 cloudnetpy/model_evaluation/tests/unit/test_tools.py,sha256=Ia_VrLdV2NstX5gbx_3AZTOAlrgLAy_xFZ8fHYVX0xI,3817
 cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV6Y,107
 cloudnetpy/plotting/plot_meta.py,sha256=JHrr-4A9fhqdi_tQFe6mR4Fdry3hkI-lmmVu5Ny2vco,15979
-cloudnetpy/plotting/plotting.py,sha256=rVaCsXTrhb0ahdXerSPLZWRASs_QktyLUbjyHoVuam8,33584
+cloudnetpy/plotting/plotting.py,sha256=6Bnex4V1DI1G_8QscPzVQyukSposA89sP-FQtBEbLHQ,34059
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=bNG8W1CMgGoUBpXopQjYAW3F-uEJGyojXb4A5jmErHo,7921
 cloudnetpy/products/der.py,sha256=1LDBbnbUg8feMUTGWJq3bObBhEcZ_Ee17MB1x0GwRdo,12669
@@ -108,8 +108,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=tN_sPDS3BdpFJfa5a2mnc3eCMoi7syjVJMaTt962hmo,5004
 cloudnetpy/products/product_tools.py,sha256=VNw2diJj30POz68-3qNVkJP7r9AUspT_d1Fp0BbeIx8,10414
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.65.3.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.65.3.dist-info/METADATA,sha256=FTAu9ootkMIzGcQRQLQoTY4hfpScx1srDx_5ZKbGypM,5784
-cloudnetpy-1.65.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-cloudnetpy-1.65.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.65.3.dist-info/RECORD,,
+cloudnetpy-1.65.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.65.5.dist-info/METADATA,sha256=CiSZoaISK9HEGkWWu0VRiYSjJ8E4YX3UUEQYXmLLqdg,5784
+cloudnetpy-1.65.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+cloudnetpy-1.65.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.65.5.dist-info/RECORD,,

{cloudnetpy-1.65.3.dist-info → cloudnetpy-1.65.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any