cloudnetpy 1.65.5__tar.gz → 1.65.7__tar.gz

{cloudnetpy-1.65.5/cloudnetpy.egg-info → cloudnetpy-1.65.7}/PKG-INFO

@@ -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 → cloudnetpy-1.65.7}/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-1.65.5 → cloudnetpy-1.65.7}/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-1.65.5 → cloudnetpy-1.65.7}/cloudnetpy/version.py

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

{cloudnetpy-1.65.5 → cloudnetpy-1.65.7/cloudnetpy.egg-info}/PKG-INFO

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