cloudnetpy 1.58.2__py3-none-any.whl → 1.58.4__py3-none-any.whl

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

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

{cloudnetpy-1.58.2.dist-info → cloudnetpy-1.58.4.dist-info}/METADATA

@@ -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
@@ -51,7 +51,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'
 Provides-Extra: test
 Requires-Dist: mypy ; extra == 'test'
 Requires-Dist: pytest ; extra == 'test'

{cloudnetpy-1.58.2.dist-info → cloudnetpy-1.58.4.dist-info}/RECORD

@@ -8,12 +8,12 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=sxQTDJF5V0jFyfz6M0CLqQ33MN8hCucqsVHRWWG45fs,72
+cloudnetpy/version.py,sha256=Ad5okgp6ACQmXN92GegEWxjqqVmfT8qSO9m364S8NCE,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
 cloudnetpy/categorize/categorize.py,sha256=_chLFT0l9ll78y3oaxFwOTBbv2raxxjghCz-_KGdImQ,17476
-cloudnetpy/categorize/classify.py,sha256=vIR7Ztu41kQbRaA2xIy_mm08KxVgQczYXpNSo0vz2Yg,8905
+cloudnetpy/categorize/classify.py,sha256=x7aqPfhw4xuER22sqOb9ES9nijwk1E8b7HF7uaFJD7k,9218
 cloudnetpy/categorize/containers.py,sha256=j6oSKPeZcq9vFthYaocAw1m6yReRNNPYUQF5UTDq4YM,4232
 cloudnetpy/categorize/disdrometer.py,sha256=0Z0nvUtoZKDxiUfBZzoYZxUFOVjq-thmYfaCkskeECs,1799
 cloudnetpy/categorize/droplet.py,sha256=pUmB-gN0t9sVgsGLof6X9N0nuEb4EBtEUswwpoQapTY,8687
@@ -92,8 +92,8 @@ cloudnetpy/model_evaluation/tests/unit/test_plotting.py,sha256=h9V8JKmrO4v9bOvv-
 cloudnetpy/model_evaluation/tests/unit/test_statistical_methods.py,sha256=Ra3r4V0qbqkpDuaTYvEIbaasl0nZ5gmTLR4eGC0glBQ,9724
 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=MK_-fByZgihXkTXVJhs942qvq9SLfyzLa911y6x8cV0,14791
-cloudnetpy/plotting/plotting.py,sha256=kzVfHy6mEzOwVgoAF26bfDlh_shK3SbvYKOlO3XZ1vk,30894
+cloudnetpy/plotting/plot_meta.py,sha256=e0X6ZCuBE0eRIbGKdT7S0RzhL_ncfo7Pi0uRhXpttnQ,14868
+cloudnetpy/plotting/plotting.py,sha256=EA40DLIwHAUtBd07zRE6ITUfutv5A_mqsySOiyv-_Gg,31014
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=0E9OUGR3uLCsS1nORwQu0SqW0_8uX7n6LlRcVhtzKw4,7845
 cloudnetpy/products/der.py,sha256=mam6jWV7A2h8V5WC3DIeFp6ou7UD1JOw9r7h2B0su-s,12403
@@ -107,8 +107,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.58.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.58.2.dist-info/METADATA,sha256=zU2eLMkK7FIQ2vgH4b8s5F3QqAqRGlbromhMXFKa_H4,5733
-cloudnetpy-1.58.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.58.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.58.2.dist-info/RECORD,,
+cloudnetpy-1.58.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.58.4.dist-info/METADATA,sha256=39_FtwhSwvqQIYO-s7t30ieR7JV2xaDLAH7zDvoLdfw,5733
+cloudnetpy-1.58.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cloudnetpy-1.58.4.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.58.4.dist-info/RECORD,,