cloudnetpy 1.78.1__tar.gz → 1.78.3__tar.gz

{cloudnetpy-1.78.1/cloudnetpy.egg-info → cloudnetpy-1.78.3}/PKG-INFO

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

{cloudnetpy-1.78.1 → cloudnetpy-1.78.3}/cloudnetpy/categorize/containers.py

@@ -89,7 +89,9 @@ class ClassData:
         rain_from_disdrometer = self._find_rain_from_disdrometer()
         ind = ~rain_from_disdrometer.mask
         is_rain[ind] = rain_from_disdrometer[ind]
-        is_positive_temp = self.tw[:, 0] > T0 + 5  # Filter snowfall
+        mask = ma.getmaskarray(self.tw)
+        first_valid_ind = np.nonzero(np.all(~mask, axis=0))[0][0]
+        is_positive_temp = self.tw[:, first_valid_ind] > T0 + 5  # Filter snowfall
         return is_rain & is_positive_temp
 
     def _find_rain_from_radar_echo(self) -> np.ndarray:

{cloudnetpy-1.78.1 → cloudnetpy-1.78.3}/cloudnetpy/categorize/radar.py

@@ -357,6 +357,16 @@ class Radar(DataSource):
         )
         # store this in the file
         self.append_data(max_folding_binned, "nyquist_velocity")
+
+        if "correction_bits" in self.dataset.variables:
+            bits = self.dataset.variables["correction_bits"][:]
+            dealiasing_bit = utils.isbit(bits, 0)
+            if ma.all(dealiasing_bit):
+                return utils.rebin_2d(self.time, data, time_new, "mean")[0]
+            if ma.any(dealiasing_bit):
+                msg = "Data are only party dealiased. Deal with this later."
+                raise NotImplementedError(msg)
+
         # with original shape (repeat maximum value for each point in every bin)
         max_folding_full, _ = utils.rebin_2d(
             self.time,
@@ -365,6 +375,7 @@ class Radar(DataSource):
             "max",
             keepdim=True,
         )
+
         data_scaled = data * (np.pi / max_folding_full)
         vel_x = ma.cos(data_scaled)
         vel_y = ma.sin(data_scaled)

{cloudnetpy-1.78.1 → cloudnetpy-1.78.3}/cloudnetpy/instruments/bowtie.py

@@ -1,6 +1,7 @@
 from os import PathLike
 
 import numpy as np
+from numpy import ma
 
 from cloudnetpy import output
 from cloudnetpy.constants import G_TO_KG, MM_H_TO_M_S
@@ -8,6 +9,7 @@ from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.instruments import FMCW94
 from cloudnetpy.instruments.nc_radar import NcRadar
 from cloudnetpy.metadata import MetaData
+from cloudnetpy.utils import bit_field_definition
 
 
 def bowtie2nc(
@@ -63,6 +65,7 @@ def bowtie2nc(
         bowtie.convert_units()
         bowtie.fix_chirp_start_indices()
         bowtie.test_if_all_masked()
+        bowtie.add_correction_bits()
     attributes = output.add_time_attribute(ATTRIBUTES, bowtie.date)
     output.update_attributes(bowtie.data, attributes)
     return output.save_level1b(bowtie, output_file, uuid)
@@ -84,6 +87,11 @@ class Bowtie(NcRadar):
         self.data["chirp_start_indices"].data = np.array(array, dtype=np.int32)
         self.data["chirp_start_indices"].data_type = "int32"
 
+    def add_correction_bits(self):
+        bits = ma.ones(self.data["v"].data.shape, dtype=np.uint32)
+        bits.mask = self.data["v"].data.mask
+        self.append_data(bits, "correction_bits")
+
     def check_date(self, date: str):
         if "-".join(self.date) != date:
             raise ValidTimeStampError
@@ -100,4 +108,13 @@ ATTRIBUTES: dict = {
             "applied to it."
         ),
     ),
+    "correction_bits": MetaData(
+        long_name="Correction bits",
+        units="1",
+        definition=bit_field_definition({0: """Doppler velocity is dealiased."""}),
+        comment=(
+            "This parameter is a bit field that indicates which corrections have\n"
+            "been applied to radar measurements."
+        ),
+    ),
 }

{cloudnetpy-1.78.1 → cloudnetpy-1.78.3}/cloudnetpy/version.py

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

{cloudnetpy-1.78.1 → cloudnetpy-1.78.3/cloudnetpy.egg-info}/PKG-INFO

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