cloudnetpy 1.85.3__py3-none-any.whl → 1.85.5__py3-none-any.whl

cloudnetpy/instruments/mrr.py

@@ -104,6 +104,7 @@ def mrr2nc(
             if date:
                 mrr.screen_by_date(date)
             mrr.add_time_and_range()
+            mrr.fix_range()
             mrr.add_site_geolocation()
             mrr.add_zenith_angle()
             mrr.add_radar_specific_variables()
@@ -161,6 +162,12 @@ class MrrPro(NcRadar):
                 valid_indices.append(ind)
         self.screen_time_indices(valid_indices)
 
+    def fix_range(self) -> None:
+        # It seems like the "range" variable in MRR-PRO raw files is actually
+        # defined above mean sea level -> convert to range above ground level
+        range_data = self.data["range"].data
+        range_data -= range_data[0]
+
 
 ATTRIBUTES = {
     "lwc": MetaData(

cloudnetpy/plotting/plot_meta.py

@@ -19,6 +19,7 @@ class PlotMeta(NamedTuple):
         moving_average: Whether to plot a moving average in a 1d plot.
         contour: Whether to plot contours on top of a filled colormap.
         zero_line: Whether to plot a zero line in a 1d plot.
+        mask_zero: Whether to mask zero values in the plot.
         time_smoothing_duration: The duration of the time smoothing window
             (in 2d plots) in minutes.
     """
@@ -30,6 +31,7 @@ class PlotMeta(NamedTuple):
     moving_average: bool = True
     contour: bool = False
     zero_line: bool = False
+    mask_zeros: bool = False
     time_smoothing_duration: int = 0
 
 
@@ -150,6 +152,7 @@ ATTRIBUTES = {
         "rainfall_rate": PlotMeta(
             cmap="Blues",
             plot_range=(0, 50 / 3600000),
+            mask_zeros=True,
         )
     },
     "mwr": {
@@ -390,6 +393,7 @@ ATTRIBUTES = {
         "number_concentration": PlotMeta(plot_range=(1e-2, 1e3), log_scale=True),
         "fall_velocity": PlotMeta(
             plot_range=(0, 10),
+            mask_zeros=True,
         ),
         "pressure": PlotMeta(
             plot_range=(1e4, 1.2e5),
@@ -598,6 +602,7 @@ ATTRIBUTES = {
             cmap="Blues",
             plot_range=(1e-5, 1e-2),
             log_scale=True,
+            mask_zeros=True,
         ),
         "lwc_error": PlotMeta(
             cmap="RdYlGn_r",
@@ -608,6 +613,7 @@ ATTRIBUTES = {
         ),
         "pia": PlotMeta(
             plot_range=(0, 3),
+            mask_zeros=True,
         ),
         "lwp": PlotMeta(
             zero_line=True,

cloudnetpy/plotting/plotting.py

@@ -362,6 +362,10 @@ class Plot:
         self._is_log = sub_plot.plot_meta.log_scale
         self._ax = sub_plot.ax
 
+    def _mask_zeros(self) -> None:
+        self._data = ma.masked_where(self._data == 0, self._data)
+        self._data_orig = ma.masked_where(self._data_orig == 0, self._data_orig)
+
     def _convert_units(self) -> str:
         multiply, add = "multiply", "add"
         units_conversion = {
@@ -491,6 +495,8 @@ class Plot:
 class Plot2D(Plot):
     def plot(self, figure_data: FigureData) -> None:
         self._convert_units()
+        if self._plot_meta.mask_zeros:
+            self._mask_zeros()
         if figure_data.file_type == "cpr-simulation":
             min_x, max_x = 0, EARTHCARE_MAX_X
         else:
@@ -689,7 +695,12 @@ class Plot2D(Plot):
 
 class Plot1D(Plot):
     def plot(self, figure_data: FigureData, hacky_freq_ind: int | None = None) -> None:
+        if self._data.mask.all() and figure_data.options.raise_on_empty:
+            msg = "All data is masked"
+            raise PlottingError(msg)
         units = self._convert_units()
+        if self._plot_meta.mask_zeros:
+            self._mask_zeros()
         self._mark_gaps(figure_data)
         self._ax.plot(
             figure_data.time_including_gaps,
@@ -820,6 +831,9 @@ class Plot1D(Plot):
         max_y = max_data + gap
         if min_y == 0 and max_y == 0:
             return fallback
+        if min_y == max_y:
+            gap = np.abs(min_y) * percent_gap
+            return min_y - gap, max_y + gap
         return min_y, max_y
 
     def _get_plot_options(self) -> dict:

cloudnetpy/version.py

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

{cloudnetpy-1.85.3.dist-info → cloudnetpy-1.85.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.85.3
+Version: 1.85.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.85.3.dist-info → cloudnetpy-1.85.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=CFpXmdEkVPzvLPv2xHIR-aMMQ-TR26KfESYw-98j7sk,7213
 cloudnetpy/output.py,sha256=0bybnILsgKHWIuw2GYkqTz2iMCJDZLUN25IQ9o_v3Cg,14968
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=x3hukn7wuOyF3ctG8EOhvLbSUHOVKLW9ez2LzTjeolU,33110
-cloudnetpy/version.py,sha256=i59FH9nxwt9SrVex3IABjWq-POhop9RboC4OtsZD_9E,72
+cloudnetpy/version.py,sha256=LIie3vB4_JAVH9ThGGPAWNjAwLy9Nrli2ODRwPbsFfY,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -47,7 +47,7 @@ cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIo
 cloudnetpy/instruments/instruments.py,sha256=WZgH7HjzM9Ane1CSnYCSLidbST8hunUeSt2lPntq9As,4999
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
 cloudnetpy/instruments/mira.py,sha256=jJ17xJmXwqfvZ7hgJaongRrRxoQpivMEQYssgSQFYbA,12638
-cloudnetpy/instruments/mrr.py,sha256=z50VYLOBW2o7enU7FHZYNFQRW2goEQpeGe7-iCBRQtg,6020
+cloudnetpy/instruments/mrr.py,sha256=KvhfNIY2ozHE1MRLNYPqtBFThxLGN_YuCpBUGDIR76s,6319
 cloudnetpy/instruments/nc_lidar.py,sha256=PtZauDdI3bX3bv4gIVvV6N53e2Co-ehBL_tByHM9hj8,1713
 cloudnetpy/instruments/nc_radar.py,sha256=XFKxPLKivnhHTgjE5HFrxjWZ0oCifhDUAog051vkMiY,7533
 cloudnetpy/instruments/pollyxt.py,sha256=IFq_RJrhgJ79OVyuo48PwYQK_zZ6VZFB_S5bEirRyzs,10566
@@ -103,8 +103,8 @@ cloudnetpy/model_evaluation/tests/unit/test_plotting.py,sha256=5hkhtqX-JQ8-Yy6DA
 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=9d1OgPDysBDUUhncXdj-_EKmGdK7JutNBkzf8YV2lVg,18249
-cloudnetpy/plotting/plotting.py,sha256=8NBqYC0RnBQarjFAmqTPYnFcfyRejfJWZ4TcR7EqVUI,41426
+cloudnetpy/plotting/plot_meta.py,sha256=TpUPmBsME3VhB-Atct6EG4ntzlo7Essre83ySp40Ulc,18454
+cloudnetpy/plotting/plotting.py,sha256=v1dD6kmMJ-t88p4rqrnFzS94qUjpI_v9fCAp49fA2V0,42015
 cloudnetpy/products/__init__.py,sha256=cBJdJBYltz5ZTKDqnRo-0StytAZK8gE3RYxxriFA4ak,295
 cloudnetpy/products/classification.py,sha256=6WxiGGJXqlAPgJ9hVNTKm3f7iGsqA7e3L3xqVxFFs7w,16894
 cloudnetpy/products/der.py,sha256=UXdAxmmwChVVWSI4QSGAXphfMnbymGRTtGdKWEvh-J4,13162
@@ -118,10 +118,10 @@ cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.85.3.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.85.5.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.85.3.dist-info/METADATA,sha256=ylmQIiMgFDoZvf40kEaDsnbZVJ46lfxiLf-J0zz4b2o,5836
-cloudnetpy-1.85.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.85.3.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.85.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.85.3.dist-info/RECORD,,
+cloudnetpy-1.85.5.dist-info/METADATA,sha256=dR72eUK34l0HmYW2R-Sn-8pqkt53ZslGXuMTwyJGKEc,5836
+cloudnetpy-1.85.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.85.5.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.85.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.85.5.dist-info/RECORD,,