cloudnetpy 1.65.4__py3-none-any.whl → 1.65.6__py3-none-any.whl

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/plotting/plotting.py

@@ -550,7 +550,7 @@ class Plot2D(Plot):
 
 
 class Plot1D(Plot):
-    def plot(self, figure_data: FigureData) -> None:
+    def plot(self, figure_data: FigureData, hacky_freq_ind: int | None = None) -> None:
         units = self._convert_units()
         self._mark_gaps(figure_data)
         self._ax.plot(
@@ -561,7 +561,7 @@ class Plot1D(Plot):
             zorder=_get_zorder("data"),
         )
         if self._plot_meta.moving_average:
-            self._plot_moving_average(figure_data)
+            self._plot_moving_average(figure_data, hacky_freq_ind)
         if self._plot_meta.zero_line:
             self._ax.axhline(0, color="black", alpha=0.5, label="_nolegend_")
         self._fill_between_data_gaps(figure_data)
@@ -594,7 +594,7 @@ class Plot1D(Plot):
                 self._plot_flag_data(figure_data.time[flags], self._data_orig[flags])
                 self._add_legend()
         self._show_frequency(figure_data, freq_ind)
-        self.plot(figure_data)
+        self.plot(figure_data, freq_ind)
 
     def _show_frequency(self, figure_data: FigureData, freq_ind: int) -> None:
         if self.sub_plot.variable.name == "tb":
@@ -675,32 +675,47 @@ class Plot1D(Plot):
 
         return default_options
 
-    def _plot_moving_average(self, figure_data: FigureData) -> None:
+    def _plot_moving_average(
+        self, figure_data: FigureData, hacky_freq_ind: int | None = None
+    ) -> 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)
+        if hacky_freq_ind is not None:
+            flags = flags[:, hacky_freq_ind]
+        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 +751,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 = 4
+PATCH = 6
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.65.4.dist-info → cloudnetpy-1.65.6.dist-info}/METADATA

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

{cloudnetpy-1.65.4.dist-info → cloudnetpy-1.65.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=3qkQVA6846RRCQrY42eyuDb5Ol3VYWPQzO4HGNHWwVI,72
+cloudnetpy/version.py,sha256=D0-EyiXBu9MXvLB8CBjoUmC5Mf_4q4qDE5OXEFZZe_4,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=ns5ydiEN34Ng6mJiOBpxKBVDU2NXj6W3Q5IUynmNRYI,3586
@@ -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
@@ -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=JIgia-Hujsa2ot4JMoBLzEdH7YWzmlGuKSLvvQ9tl0U,34253
 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.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.65.4.dist-info/METADATA,sha256=03NRS2aq4SU7NYndDEgxYHOYUPyg4qQWnjlF4h5N8C8,5784
-cloudnetpy-1.65.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-cloudnetpy-1.65.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.65.4.dist-info/RECORD,,
+cloudnetpy-1.65.6.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.65.6.dist-info/METADATA,sha256=igbDKmd8AkrBWmqc5ftMQLgu6UFQtzeTr6lPZUVBw1c,5784
+cloudnetpy-1.65.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+cloudnetpy-1.65.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.65.6.dist-info/RECORD,,

{cloudnetpy-1.65.4.dist-info → cloudnetpy-1.65.6.dist-info}/WHEEL

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