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

cloudnetpy/categorize/droplet.py

@@ -114,7 +114,7 @@ def find_liquid(
         peak_width = height[top] - height[base]
         peak_alt = height[peak] - height[0]
         top_der = (lprof[peak] - lprof[top]) / (height[top] - height[peak])
-        is_positive_lwp = lwp_int[n] > min_lwp
+        is_positive_lwp = lwp_int[n] >= min_lwp
         if _is_proper_peak():
             is_liquid[n, base : top + 1] = True
 

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,10 +675,14 @@ 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()
         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

cloudnetpy/version.py

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

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

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

{cloudnetpy-1.65.5.dist-info → cloudnetpy-1.65.7.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=7taBpMQJ9IcUdGe8zT3heZNDf-x-mFFQ3gSVNYJYWjw,72
+cloudnetpy/version.py,sha256=B0fKgZkDpneBNddUtrKe13FSc_Y17mGFfki5_swqhMU,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
@@ -16,7 +16,7 @@ cloudnetpy/categorize/categorize.py,sha256=VcxSs22icYDG3R5x9jTX7uuSjPU8tyc5bIz0Z
 cloudnetpy/categorize/classify.py,sha256=a-0bVCtynGfORnDGTsPuzqkuDeOOR_OMz5ai9NsMuic,9870
 cloudnetpy/categorize/containers.py,sha256=g3SQHoqlY1uJ8b-MG-BbW3oWz5IyacA8kJBeIPy_4EA,4859
 cloudnetpy/categorize/disdrometer.py,sha256=keU3pFvKtk840A0oLwAyNDuqOCswBPJEKf2bV0YWyA8,2004
-cloudnetpy/categorize/droplet.py,sha256=894VHdL9ScaB8f1oxXwM2la4ShXd-uWywQDINoaoiD8,8687
+cloudnetpy/categorize/droplet.py,sha256=s-q1nCZ40rw5-fabfj61mH2lmdcNRT-TASvwWGZeptY,8688
 cloudnetpy/categorize/falling.py,sha256=Wz49mbw0pubnbhoekYTqGT0S9UNaE88jWOjSPEsCIaI,4386
 cloudnetpy/categorize/freezing.py,sha256=c4k5AIgfBpvw64EaVVVYPi2Fx4SpHk1cyfceE1ydD28,3755
 cloudnetpy/categorize/insects.py,sha256=9J5agmktit8Or66GGNue-bThiaG9rB2SuPNZBXI7FCE,5243
@@ -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=6Bnex4V1DI1G_8QscPzVQyukSposA89sP-FQtBEbLHQ,34059
+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.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.7.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.65.7.dist-info/METADATA,sha256=KHoz5LFKsFR3kBEdosbY1L_jC15RvnJCjnotAaTQF0w,5784
+cloudnetpy-1.65.7.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+cloudnetpy-1.65.7.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.65.7.dist-info/RECORD,,