cloudnetpy 1.58.2__tar.gz → 1.58.4__tar.gz

{cloudnetpy-1.58.2/cloudnetpy.egg-info → cloudnetpy-1.58.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.58.2
+Version: 1.58.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -57,7 +57,7 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: release-version; extra == "dev"
 Provides-Extra: extras
-Requires-Dist: voodoonet>=0.1.1; extra == "extras"
+Requires-Dist: voodoonet>=0.1.7; extra == "extras"
 
 # CloudnetPy
 

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/cloudnetpy/categorize/classify.py

@@ -42,10 +42,17 @@ def classify_measurements(data: dict) -> ClassificationResult:
     bits[2] = freezing.find_freezing_region(obs, bits[3])
     liquid_from_lidar = droplet.find_liquid(obs)
     if obs.lv0_files is not None and len(obs.lv0_files) > 0:
+        if "rpg-fmcw-94" not in obs.radar_type.lower():
+            msg = "VoodooNet is only implemented for RPG-FMCW-94 radar."
+            raise NotImplementedError(msg)
         import voodoonet
+        from voodoonet.utils import VoodooOptions
 
+        options = VoodooOptions(progress_bar=False)
         target_time = voodoonet.utils.decimal_hour2unix(obs.date, obs.time)
-        liquid_prob = voodoonet.infer(obs.lv0_files, target_time=target_time)
+        liquid_prob = voodoonet.infer(
+            obs.lv0_files, target_time=target_time, options=options
+        )
         liquid_from_radar = liquid_prob > 0.55
         liquid_from_radar = _remove_false_radar_liquid(
             liquid_from_radar,

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/cloudnetpy/plotting/plot_meta.py

@@ -463,6 +463,9 @@ ATTRIBUTES = {
         "insect_prob": PlotMeta(
             plot_range=(0, 1),
         ),
+        "liquid_prob": PlotMeta(
+            plot_range=(0, 0.7),
+        ),
         "radar_liquid_atten": PlotMeta(
             plot_range=(0, 5),
         ),

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/cloudnetpy/plotting/plotting.py

@@ -145,9 +145,10 @@ class FigureData:
         valid_variables = []
         variable_indices = []
         for variable_name in requested_variables:
-            if variable_name.startswith("tb_"):
-                extracted_name = "tb"
-                extracted_ind = int(variable_name.split("_")[1])
+            if variable_name.startswith(("tb_", "irt_")):
+                parts = variable_name.split("_")
+                extracted_name = parts[0]
+                extracted_ind = int(parts[1])
             else:
                 extracted_name = variable_name
                 extracted_ind = None
@@ -554,13 +555,14 @@ class Plot1D(Plot):
         is_bad_zenith = self._get_bad_zenith_profiles(figure_data)
         self._data[is_bad_zenith] = ma.masked
         self._data_orig[is_bad_zenith] = ma.masked
-        flags = self._read_flagged_data(figure_data)[:, freq_ind]
-        flags[is_bad_zenith] = False
-        if np.any(flags):
-            self._plot_flag_data(figure_data.time[flags], self._data_orig[flags])
-            self._add_legend()
+        if self.sub_plot.variable == "tb":
+            flags = self._read_flagged_data(figure_data)[:, freq_ind]
+            flags[is_bad_zenith] = False
+            if np.any(flags):
+                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._show_frequency(figure_data, freq_ind)
 
     def _show_frequency(self, figure_data: FigureData, freq_ind: int) -> None:
         frequency = figure_data.file.variables["frequency"][freq_ind]
@@ -737,7 +739,7 @@ def generate_figure(
             file_type = getattr(file, "cloudnet_file_type", None)
             subplot = SubPlot(ax, variable, options, file_type)
 
-            if variable.name == "tb" and ind is not None:
+            if variable.name in ("tb", "irt") and ind is not None:
                 Plot1D(subplot).plot_tb(figure_data, ind)
             elif variable.ndim == 1:
                 Plot1D(subplot).plot(figure_data)

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 58
-PATCH = 2
+PATCH = 4
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.58.2
+Version: 1.58.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -57,7 +57,7 @@ Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: release-version; extra == "dev"
 Provides-Extra: extras
-Requires-Dist: voodoonet>=0.1.1; extra == "extras"
+Requires-Dist: voodoonet>=0.1.7; extra == "extras"
 
 # CloudnetPy
 

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/cloudnetpy.egg-info/requires.txt

@@ -12,7 +12,7 @@ pre-commit
 release-version
 
 [extras]
-voodoonet>=0.1.1
+voodoonet>=0.1.7
 
 [test]
 mypy

{cloudnetpy-1.58.2 → cloudnetpy-1.58.4}/pyproject.toml

@@ -35,7 +35,7 @@ test = [
   "types-requests",
 ]
 dev = ["pre-commit", "release-version"]
-extras = ["voodoonet>=0.1.1"]
+extras = ["voodoonet>=0.1.7"]
 
 [project.urls]
 Homepage = "https://github.com/actris-cloudnet/cloudnetpy"