cloudnetpy 1.78.1__py3-none-any.whl → 1.78.3__py3-none-any.whl

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

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

{cloudnetpy-1.78.1.dist-info → cloudnetpy-1.78.3.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.78.3.dist-info}/RECORD

@@ -9,13 +9,13 @@ cloudnetpy/metadata.py,sha256=lO7BCbVAzFoH3Nq-VuezYX0f7MnbG1Zp11g5GSiuQwM,6189
 cloudnetpy/output.py,sha256=gupxt4f_-eUrFsWMto8tnknoV-p9QauC9L6CJAqBILU,15988
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=HdcSNIgdxoZlP_jHl66ItheHLw_cDYZb7u6mZ5dfMNE,31952
-cloudnetpy/version.py,sha256=3xCJ6Zv7LkLahqubKZWS5YDwui01I7yk-Z-3oUGO9Us,72
+cloudnetpy/version.py,sha256=pYMEbxEa9ahzrcn_G9DIIY9enBLmzjF9ZpI-AB73HTw,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
 cloudnetpy/categorize/categorize.py,sha256=PzkgQ63MtEHlz_0govFkoM6F41OKgQLsxDh7GLQHyrs,20777
 cloudnetpy/categorize/classify.py,sha256=qovHgHsMku5kpl3cJxKteNBsG8GAkfI3Zo8QhJwZSFQ,8512
-cloudnetpy/categorize/containers.py,sha256=evqVQOoUycBtaFeKpms7_NuM9z8jKWq37nLIhoDxa8k,5278
+cloudnetpy/categorize/containers.py,sha256=9nAmI1OnR_uANyTZS1cD4do6NrC90EqliEMVrFnQY24,5398
 cloudnetpy/categorize/disdrometer.py,sha256=sRSt2B932lrrkvycKoSaKEIaDVfq9Z7uU-4iHRr-fC0,1893
 cloudnetpy/categorize/droplet.py,sha256=t49KEsH5ZM68JQ4NvAf9kGgQ-evic1T4de2-jgJ2f4M,8683
 cloudnetpy/categorize/falling.py,sha256=lok0HMi1ewf9pS70mq62nRKL6wJzMyWbYmv1cdwrwnA,4404
@@ -26,7 +26,7 @@ cloudnetpy/categorize/lidar.py,sha256=YQrM_LOz8NQrrD9l9HyujV1GSGwkQ8LMqXN13bEJRW
 cloudnetpy/categorize/melting.py,sha256=ZnLeL_qWmiCdjXVOm9iBYHdo29Brqxu_DEErZPqUloQ,6217
 cloudnetpy/categorize/model.py,sha256=QFRCY0TvM2fzGRyP8BNkqbvu13XcQjt7TsN5fhjI_Uc,6654
 cloudnetpy/categorize/mwr.py,sha256=F7cquERWL6mBkgboqeaCIPf9gOlKI-NWUQIBdQXGT_I,1635
-cloudnetpy/categorize/radar.py,sha256=z2bFF_wAKbzzXB3Pq1z33Y1RMv6NL-8CdZesU89qzpw,15502
+cloudnetpy/categorize/radar.py,sha256=Bc-JkMpU3_wFBo7eMMtlF5oiyTaIwbs_BsAn4dufTsE,15953
 cloudnetpy/categorize/attenuations/__init__.py,sha256=CWFHVWeTIe2hrZtgkJaX2HGftbuffsFc39Mzv5B0Lw0,1037
 cloudnetpy/categorize/attenuations/gas_attenuation.py,sha256=emr-RCxQT0i2N8k6eBNhRsmsCBPHJzQsWJfjC4fVSTo,975
 cloudnetpy/categorize/attenuations/liquid_attenuation.py,sha256=0p0G79BPkw1itCXHMwbvkNHtJGBocJzow3gNHAirChI,3036
@@ -34,7 +34,7 @@ cloudnetpy/categorize/attenuations/melting_attenuation.py,sha256=9c9xoZHtGUbjFYJ
 cloudnetpy/categorize/attenuations/rain_attenuation.py,sha256=qazJzRyXf9vbjJhh4yiFmABI4L57j5W_6YZ-6qjRiBI,2839
 cloudnetpy/instruments/__init__.py,sha256=PEgrrQNoiOuN_ctYilmt4LV2QCLg1likPjJdWtuGlLs,528
 cloudnetpy/instruments/basta.py,sha256=Lb_EhQTI93S5Bd9osDbCE_tC8gZreRsHz7D2_dFOjmE,3793
-cloudnetpy/instruments/bowtie.py,sha256=GlWCxemeXrIvWnnQRvZa1ttl4J0NmLUdc7xngIH5WBI,3281
+cloudnetpy/instruments/bowtie.py,sha256=EyE8HAE8rjO7JelJDbQte_rnwE3VoVJVc6TBpSNK3IU,3930
 cloudnetpy/instruments/ceilo.py,sha256=qM3AkQKHUblhRCD42HsB6lr82giBH-0g_VzoWHZDgeA,9535
 cloudnetpy/instruments/ceilometer.py,sha256=ati9-fUQ54K9tvynIPB-nlBYwtvBVaQtUCjVCLNB67w,12059
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
@@ -117,10 +117,10 @@ cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=8HPZpQMTojKZP1JS1S83IE0sxmbDE9bxlaWoqmGnUZE,6199
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.78.1.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.78.3.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.78.1.dist-info/METADATA,sha256=AznJgGBfGvD7cbWAieBBM5xVu3Wn9GQebLBXaAVFJUE,5796
-cloudnetpy-1.78.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.78.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.78.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.78.1.dist-info/RECORD,,
+cloudnetpy-1.78.3.dist-info/METADATA,sha256=rwmnbibL2ih6Bub0PwnyBbDzEYoSFQLS_IAuERyxDb0,5796
+cloudnetpy-1.78.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.78.3.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.78.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.78.3.dist-info/RECORD,,