cloudnetpy 1.66.17__py3-none-any.whl → 1.66.19__py3-none-any.whl

cloudnetpy/instruments/instruments.py

@@ -142,11 +142,18 @@ HALO = Instrument(
     model="StreamLine",
 )
 
-WINDCUBE = Instrument(
-    manufacturer="Leosphere",
+WINDCUBE_WLS200S = Instrument(
+    manufacturer="Vaisala",
+    domain="lidar",
+    category="Doppler lidar",
+    model="WindCube WLS200S",
+)
+
+WINDCUBE_WLS70 = Instrument(
+    manufacturer="Vaisala",
     domain="lidar",
     category="Doppler lidar",
-    model="WindCube",
+    model="WindCube WLS70",
 )
 
 PARSIVEL2 = Instrument(

cloudnetpy/instruments/mira.py

@@ -72,6 +72,7 @@ def mira2nc(
             mira.screen_by_snr()
             mira.screen_invalid_ldr()
             mira.mask_invalid_data()
+            mira.mask_bad_angles()
             mira.add_time_and_range()
             mira.add_site_geolocation()
             mira.add_radar_specific_variables()
@@ -128,6 +129,18 @@ class Mira(NcRadar):
             )
             self.data["ldr"].data[:] = ma.masked
 
+    def mask_bad_angles(self) -> None:
+        """Masks clearly bad elevation and azimuth angles."""
+        limits = {
+            "elevation": (0, 180),
+            "azimuth_angle": (-360, 360),
+        }
+        for key, (lower, upper) in limits.items():
+            if (array := self.data[key].data) is not None:
+                margin = (upper - lower) * 0.05
+                array[array < (lower - margin)] = ma.masked
+                array[array > (upper + margin)] = ma.masked
+
 
 def _parse_input_files(input_files: str | list[str], temp_dir: str) -> tuple:
     if isinstance(input_files, list) or os.path.isdir(input_files):
@@ -219,7 +232,6 @@ def _get_keymap(filetype: str) -> dict:
                 ("SNRh2l", "SNR"),
                 ("elv", "elevation"),
                 ("azi", "azimuth_angle"),
-                ("aziv", "azimuth_velocity"),
                 ("nfft", "nfft"),
                 ("nave", "nave"),
                 ("prf", "prf"),
@@ -234,7 +246,6 @@ def _get_keymap(filetype: str) -> dict:
             "SNRg": "SNR",
             "elv": "elevation",
             "azi": "azimuth_angle",
-            "aziv": "azimuth_velocity",
             "nfft": "nfft",
             "nave": "nave",
             "prf": "prf",

cloudnetpy/instruments/nc_radar.py

@@ -94,41 +94,26 @@ class NcRadar(DataSource, CloudnetInstrument):
         """Adds non-varying instrument zenith and azimuth angles and returns valid
         time indices.
         """
-        if "azimuth_velocity" in self.data:
-            azimuth = self.data["azimuth_velocity"].data
-            azimuth_reference = azimuth[0] if np.all(azimuth == azimuth[0]) else 0
-            azimuth_tolerance = 1e-6
-        else:
-            azimuth = self.data["azimuth_angle"].data
-            azimuth_reference = ma.median(azimuth)
-            azimuth_tolerance = 0.1
-
         elevation = self.data["elevation"].data
+        azimuth = self.data["azimuth_angle"].data
 
-        # Elevation is sometimes around -1000 indicating missing value
-        # Assume the instrument is pointing vertically in these cases
-        elevation[elevation < 0] = 90
-        zenith = 90 - elevation
+        elevation_diff = ma.diff(elevation, prepend=elevation[1])
+        azimuth_diff = ma.diff(azimuth, prepend=azimuth[1])
 
-        is_valid_zenith = np.abs(zenith) < 10
-        if not np.any(is_valid_zenith):
-            msg = "No valid zenith angles"
-            raise ValidTimeStampError(msg)
+        is_stable = np.abs(elevation - 90) < 1
+        is_stable &= np.abs(elevation_diff) < 1e-6
+        is_stable &= np.abs(azimuth_diff) < 1e-3
 
-        valid_zenith = zenith[is_valid_zenith]
-        is_stable_zenith = np.isclose(zenith, ma.median(valid_zenith), atol=0.1)
-        is_stable_azimuth = np.isclose(
-            azimuth,
-            azimuth_reference,
-            atol=azimuth_tolerance,
-        )
-        is_stable_profile = is_stable_zenith & is_stable_azimuth
+        # If scanning unit is broken, data are missing
+        # (assume it's vertically pointing)
+        missing_info = elevation.mask & azimuth.mask
+        is_stable[missing_info] = True
 
-        if ma.isMaskedArray(is_stable_profile):
-            is_stable_profile[is_stable_profile.mask] = False
-        n_removed = np.count_nonzero(~is_stable_profile)
+        if ma.isMaskedArray(is_stable):
+            is_stable[is_stable.mask] = False
+        n_removed = np.count_nonzero(~is_stable)
 
-        if n_removed >= len(zenith) - 1:
+        if n_removed >= len(elevation) - 1:
             msg = "Less than two profiles with valid zenith / azimuth angles"
             raise ValidTimeStampError(msg)
 
@@ -137,11 +122,10 @@ class NcRadar(DataSource, CloudnetInstrument):
                 "Filtering %s profiles due to varying zenith / azimuth angle",
                 n_removed,
             )
+        zenith = 90 - elevation
         self.append_data(zenith, "zenith_angle")
-        for key in ("elevation", "azimuth_velocity"):
-            if key in self.data:
-                del self.data[key]
-        return list(is_stable_profile)
+        del self.data["elevation"]
+        return list(is_stable)
 
     def add_radar_specific_variables(self) -> None:
         """Adds radar specific variables."""

cloudnetpy/plotting/plotting.py

@@ -45,6 +45,8 @@ class PlotParameters:
         plot_meta: Additional metadata for the plot.
         raise_on_empty: Whether to raise an error if no data is found for a
             plotted variable.
+        minor_ticks: Whether to display minor ticks on the x-axis.
+
     """
 
     dpi: float = 120
@@ -58,6 +60,7 @@ class PlotParameters:
     footer_text: str | None = None
     plot_meta: PlotMeta | None = None
     raise_on_empty: bool = False
+    minor_ticks: bool = False
 
 
 class Dimensions:
@@ -210,6 +213,9 @@ class SubPlot:
         ]
         self.ax.set_xticks(np.arange(0, 25, resolution, dtype=int))
         self.ax.set_xticklabels(x_tick_labels, fontsize=12)
+        if self.options.minor_ticks:
+            self.ax.xaxis.set_minor_locator(AutoMinorLocator(4))
+            self.ax.tick_params(which="minor", length=2.5)
         self.ax.set_xlim(0, 24)
 
     def set_yax(
@@ -910,6 +916,8 @@ def _get_max_gap_in_minutes(figure_data: FigureData) -> float:
         "mwr-multi": 35,
         "weather-station": 12,
         "doppler-lidar-wind": 75,
+        "doppler-lidar": 75,
+        "radar": 5,
     }
     return max_allowed_gap.get(file_type, 10)
 

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 66
-PATCH = 17
+PATCH = 19
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.66.17.dist-info → cloudnetpy-1.66.19.dist-info}/METADATA

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

{cloudnetpy-1.66.17.dist-info → cloudnetpy-1.66.19.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=DOGt7EQLS-AVJEszrUrpXr3gHVQv655FzeCzKrOPvoU,5477
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JksYOwf9ORiR_QpoKrTe1JJwXpPYJj-wlwaZKCHoh3o,29744
-cloudnetpy/version.py,sha256=I_QExn3cCA9D7n_90Qiz-7ArHlSnWElngZHWc2kPtBo,73
+cloudnetpy/version.py,sha256=LenpDgU7pkca-TTIRr09FikaXYR6wcpd58u4rgZjJdo,73
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -42,12 +42,12 @@ cloudnetpy/instruments/cloudnet_instrument.py,sha256=6qQSyQXHBTdOvzqTxOXtx6RYDm7
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
 cloudnetpy/instruments/galileo.py,sha256=yQBedd7dmDnwuWi1MtXOsg4-RyRx0uRAXumCY4YuH9k,4686
 cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
-cloudnetpy/instruments/instruments.py,sha256=jG5TYnZ8bdCZXnI303ZsaJBEdSKaIjKMbkGtnq6kQX0,3261
+cloudnetpy/instruments/instruments.py,sha256=QPhaQ6Eh6gSuPWQ97Zk3gkCwzT57u3kBlk7-BcoR-jo,3413
 cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
-cloudnetpy/instruments/mira.py,sha256=f679zjmIxLVVtUVSMeO5IWbEdaj6qOJu5Gf9MKQJSL8,9412
+cloudnetpy/instruments/mira.py,sha256=zfpPLCJLRc11wB-ddkQC9JALdwz73EgVbknv8iDJtuE,9847
 cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
-cloudnetpy/instruments/nc_radar.py,sha256=HP6PNR5Y4qB6Q2OhQAmxWbe5QTTwNlw39TOWpeUe_bI,7399
+cloudnetpy/instruments/nc_radar.py,sha256=PM4XQm2Ri9pLOh2mt9dphjdXr1_aPKMFWp2T_hDNo3c,6730
 cloudnetpy/instruments/pollyxt.py,sha256=lkiBu8ChvLd86eCkeIGxHKwraeDQFuVSgCVlsAYTYN8,9010
 cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
 cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
@@ -101,7 +101,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=d7CIT4ltUsjKw0HNnOXPkaLdZbkSmTuq6AbKdbODfZE,16730
-cloudnetpy/plotting/plotting.py,sha256=ufFKChNK9Z6uRRBtMLT5AvZiyWiakPLGgC9OHWaC8Z0,35504
+cloudnetpy/plotting/plotting.py,sha256=KcvYCw2FaFeunAjaisbm-zxi1YFMiJeW8ni3J_yBuD4,35812
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
 cloudnetpy/products/classification.py,sha256=KwAiBSgFwDqhM114NIgYiUjj8HoYc7gAlc8E1QgcSig,8207
 cloudnetpy/products/der.py,sha256=soypE7uSEP4uHUCCQVEhyXsKY6e9mzV9B_2S5GUizqk,12729
@@ -115,9 +115,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.17.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.17.dist-info/METADATA,sha256=oQg4KOesIN8UvulDIPye5gt2VrnZr5IcITc5yPFEot8,5794
-cloudnetpy-1.66.17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-cloudnetpy-1.66.17.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.66.17.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.17.dist-info/RECORD,,
+cloudnetpy-1.66.19.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.19.dist-info/METADATA,sha256=5qIRCwOdmWKJeIztby_B29Qz68rRRr81WJoCnmPfDBk,5794
+cloudnetpy-1.66.19.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+cloudnetpy-1.66.19.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.66.19.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.19.dist-info/RECORD,,