cloudnetpy 1.46.2__py3-none-any.whl → 1.46.4__py3-none-any.whl

cloudnetpy/categorize/melting.py

@@ -62,7 +62,6 @@ def find_melting_layer(obs: ClassData, smooth: bool = True) -> np.ndarray:
     t_range = _find_model_temperature_range(obs.model_type)
 
     for ind, t_prof in enumerate(obs.tw):
-
         temp_indices = _get_temp_indices(t_prof, t_range)
         if len(temp_indices) <= 1:
             continue

cloudnetpy/categorize/radar.py

@@ -127,7 +127,7 @@ class Radar(DataSource):
             data, 0, min_coverage=0.3, z_limit=-30, distance=3, n_blocks=20
         )
         if n_vertical > 0 or n_horizontal > 0:
-            logging.info(
+            logging.debug(
                 f"Filtered {n_vertical} vertical and {n_horizontal} horizontal stripes "
                 f"from radar data using {variable}"
             )
@@ -141,7 +141,6 @@ class Radar(DataSource):
         distance: float,
         n_blocks: int,
     ) -> int:
-
         if axis == 0:
             data = data.T
             echo = self.data["Z"][:].T

cloudnetpy/cloudnetarray.py

@@ -94,7 +94,6 @@ class CloudnetArray:
                 setattr(self, key, data)
 
     def _init_data(self) -> np.ndarray:
-
         if isinstance(self.variable, netCDF4.Variable):
             return self.variable[:]
         if isinstance(self.variable, np.ndarray):

cloudnetpy/instruments/ceilometer.py

@@ -144,7 +144,7 @@ class NoisyData:
             else self.noise_param.noise_min
         )
         noise_below_threshold = noise < noise_min
-        logging.info(f"Adjusted noise of {sum(noise_below_threshold)} profiles")
+        logging.debug(f"Adjusted noise of {sum(noise_below_threshold)} profiles")
         noise[noise_below_threshold] = noise_min
         return noise
 
@@ -164,7 +164,7 @@ class NoisyData:
             profile = data[time_ind, alt_ind:]
             profile[profile < threshold] = ma.masked
         cleaned_time_indices = np.unique(time_indices)
-        logging.info(
+        logging.debug(
             f"Cleaned {len(cleaned_time_indices)} profiles with negative filter"
         )
         return cleaned_time_indices
@@ -181,7 +181,7 @@ class NoisyData:
         )
         variance = _calc_var_from_top_gates(self.data["beta_raw"])
         is_fog = (signal_sum > signal_sum_threshold) | (variance < variance_threshold)
-        logging.info(f"Cleaned {sum(is_fog)} profiles with fog filter")
+        logging.debug(f"Cleaned {sum(is_fog)} profiles with fog filter")
         return is_fog
 
     def _remove_noise(

cloudnetpy/instruments/cloudnet_instrument.py

@@ -24,7 +24,7 @@ class CloudnetInstrument:
             elif isinstance(self.dataset, netCDF4.Dataset) and hasattr(
                 self.dataset, key.capitalize()
             ):
-                value = float(getattr(self.dataset, key.capitalize()).split()[0])
+                value = self.parse_global_attribute_numeral(key.capitalize())
             # From source data (BASTA / RPG):
             elif (
                 isinstance(self.dataset, netCDF4.Dataset)
@@ -35,6 +35,13 @@ class CloudnetInstrument:
                 value = float(ma.mean(value))
                 self.data[key] = CloudnetArray(value, key)
 
+    def parse_global_attribute_numeral(self, key: str) -> float:
+        new_str = ""
+        for char in getattr(self.dataset, key):
+            if char.isdigit() or char == ".":
+                new_str += char
+        return float(new_str)
+
     def add_height(self) -> None:
         try:
             zenith_angle = ma.median(self.data["zenith_angle"].data)

cloudnetpy/instruments/mira.py

@@ -69,7 +69,7 @@ def mira2nc(
                 valid_filenames,
                 mmclx_filename,
                 variables=variables,
-                allow_difference=["nave"],
+                allow_difference=["nave", "ovl"],
             )
         else:
             mmclx_filename = raw_mira

cloudnetpy/instruments/nc_radar.py

@@ -71,7 +71,10 @@ class NcRadar(DataSource, CloudnetInstrument):
         time indices."""
         if "azimuth_velocity" in self.data:
             azimuth = self.data["azimuth_velocity"].data
-            azimuth_reference = 0
+            if np.all(azimuth == azimuth[0]):
+                azimuth_reference = azimuth[0]
+            else:
+                azimuth_reference = 0
             azimuth_tolerance = 1e-6
         else:
             azimuth = self.data["azimuth_angle"].data
@@ -85,6 +88,8 @@ class NcRadar(DataSource, CloudnetInstrument):
             azimuth, azimuth_reference, atol=azimuth_tolerance
         )
         is_stable_profile = is_stable_zenith & is_stable_azimuth
+        if ma.isMaskedArray(is_stable_profile):
+            is_stable_profile[is_stable_profile.mask] = False
         n_removed = np.count_nonzero(~is_stable_profile)
         if n_removed >= len(zenith) - 1:
             raise ValidTimeStampError(

cloudnetpy/instruments/pollyxt.py

@@ -109,7 +109,7 @@ class PollyXt(Ceilometer):
         calibration_factors: np.ndarray = np.array([])
         beta_channel = self._get_valid_beta_channel(bsc_files)
         bsc_key = f"attenuated_backscatter_{beta_channel}nm"
-        for (bsc_file, depol_file) in zip(bsc_files, depol_files):
+        for bsc_file, depol_file in zip(bsc_files, depol_files):
             with (
                 netCDF4.Dataset(bsc_file, "r") as nc_bsc,
                 netCDF4.Dataset(depol_file, "r") as nc_depol,

cloudnetpy/output.py

@@ -312,7 +312,6 @@ def update_attributes(cloudnet_variables: dict, attributes: dict) -> None:
 def _write_vars2nc(nc: netCDF4.Dataset, cloudnet_variables: dict) -> None:
     """Iterates over Cloudnet instances and write to netCDF file."""
     for obj in cloudnet_variables.values():
-
         if ma.isMaskedArray(obj.data):
             fill_value = netCDF4.default_fillvals[obj.data_type]
         else:

cloudnetpy/utils.py

@@ -180,7 +180,7 @@ def rebin_2d(
             masked_result[ind, :] = ma.masked
             empty_indices.append(ind)
     if len(empty_indices) > 0:
-        logging.info(f"No radar data in {len(empty_indices)} bins")
+        logging.debug(f"No radar data in {len(empty_indices)} bins")
 
     return masked_result, empty_indices
 

cloudnetpy/version.py

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

{cloudnetpy-1.46.2.dist-info → cloudnetpy-1.46.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.46.2
+Version: 1.46.4
 Summary: Python package for Cloudnet processing
 Home-page: https://github.com/actris-cloudnet/cloudnetpy
 Author: Finnish Meteorological Institute

{cloudnetpy-1.46.2.dist-info → cloudnetpy-1.46.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 cloudnetpy/__init__.py,sha256=4dlz-_2LvmdE4HHhrRlWyN1CkNjXlApxi_z-TebIxAY,74
-cloudnetpy/cloudnetarray.py,sha256=A36Ktmpdqp0Xjn9LfNST27QD4W5CPNbdQjzj3zxcUgQ,6639
+cloudnetpy/cloudnetarray.py,sha256=OLlH66AzFuEZYy4orR2WwF9WYS03ApO9OZ0VQm7khB4,6638
 cloudnetpy/concat_lib.py,sha256=3HmHXSIGPkm4yDlNg6TKFQYtsDs7fvcO3dG0Pwt-Jd8,9517
 cloudnetpy/constants.py,sha256=CC6qwVMcznFY6H4j3wz4mxUFnSn81QbScGi-PjF_3i4,402
 cloudnetpy/datasource.py,sha256=TB0AZDjRWahROfBkn9drtGmeEqKW469n2Tv6SgdBMcg,7107
 cloudnetpy/exceptions.py,sha256=sXcxhlyz_8ICLa1eliujfescrUuK1UM0aAEXexx91Gw,981
 cloudnetpy/metadata.py,sha256=4stvQT5oxNdxu6Bh7NbT5LH65CIpzhfGA_Cey5Ai6m4,5022
-cloudnetpy/output.py,sha256=d1_UBiu1KxwpeUxBQDDx4kTW5Uucc3307wTI9dDKe38,12338
+cloudnetpy/output.py,sha256=GjGGAJAKE-MNE0lwUoTborApn-LEru7vtdPXmtMDOoE,12337
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/utils.py,sha256=X7ZKsilyoIvPYsVi_mMajaULuRkzk9QZ9BMsZvLsXfw,26972
-cloudnetpy/version.py,sha256=hIx2qs7PpRNjpr141lTXDMckumko1lv1ksLTu_BNibY,72
+cloudnetpy/utils.py,sha256=Rsh_ojLNMH5ps7fWLKvF74Xd9B1yC9JqL507eRljyDQ,26973
+cloudnetpy/version.py,sha256=OeZaTiXmB4jO5q3MIlz_LjgWry5B_IOBT7fkSktDlOY,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=-Z1y1Eaju7pG2yOIgUeIf-xH21HRxzWfJ9AOIrVL4A8,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=6WdfGqzOvnaDW7vlMMrZBJIxW_eHQdjH-Xl_iPv1TTI,3716
@@ -20,26 +20,26 @@ cloudnetpy/categorize/falling.py,sha256=k21J-lsN07YxtMkIIwEnQmJjgqaw4dpNMMVDqzWd
 cloudnetpy/categorize/freezing.py,sha256=sNt02CK45QkOCrWymgOQIrdo0E4C3rqmJQo1h_A74AE,3538
 cloudnetpy/categorize/insects.py,sha256=gDZWMyNJ6sV9RS5xr38KoHlqEJIKptHHtP9L7GsLCQ0,5153
 cloudnetpy/categorize/lidar.py,sha256=Ev5dMg8X-CHLR2xVJCyqgyQEoyBJsUgj7B3lkOHkpc8,2521
-cloudnetpy/categorize/melting.py,sha256=pstRC2bMnHB1TmijajtAqJe9HK0FYevNVWp2Y3dE2pk,6033
+cloudnetpy/categorize/melting.py,sha256=DFlIHYgOjyIj3KNopgrTf2mC8awGa6tQWLvkbRG1lL8,6032
 cloudnetpy/categorize/model.py,sha256=euC5JpccsfcUOuyzj1jFNncRxXZnKsylJpsg2QHKAF0,5034
 cloudnetpy/categorize/mwr.py,sha256=mr16Du3lgzw1WQVIDYEyZKl-3r6G78phwvIPwUjd5rA,1383
-cloudnetpy/categorize/radar.py,sha256=POPzZX2BbO9ofXc5cX0pESx83gX35DfuQtNn8cYaCzg,12425
+cloudnetpy/categorize/radar.py,sha256=3Or3_jWxs9rbwJ3XKzl4hPilg0bFdCRMrbkIAuS3H08,12425
 cloudnetpy/instruments/__init__.py,sha256=1QuE0QQx2Q96Q_sZy2Vof7qahBYzK1KI1U4MWc-oZQM,355
 cloudnetpy/instruments/basta.py,sha256=9KeP65uxOTUH1YavaI8sp35n-VcM-WgtqMfB3bxKSPo,3714
 cloudnetpy/instruments/ceilo.py,sha256=Tow4hQFhTxZ84pqqIIUMPNS-yYDsDISNXfqQKPjDmRQ,7341
-cloudnetpy/instruments/ceilometer.py,sha256=5ZIsJh8TekXQWzaXZoqngV7b3ceK7a8zmd9DrPQaseI,10495
+cloudnetpy/instruments/ceilometer.py,sha256=j3Wb2wJlSGLaZkguPe3nv4751TfGd-hJjithKYNOsO4,10498
 cloudnetpy/instruments/cl61d.py,sha256=Qk2YQRrRkivc6nW2gOI7KKLt9rR4JAWF0bfbj8Hd_lY,1653
-cloudnetpy/instruments/cloudnet_instrument.py,sha256=ayBkzNpjzqckh8_dsIgt-pRQCP5mODaUTMO_EdiGsUI,3029
+cloudnetpy/instruments/cloudnet_instrument.py,sha256=vZgwGJx0Ky7h1ThY3O7lRmj3PD6vutwpvfEUXleOP24,3268
 cloudnetpy/instruments/copernicus.py,sha256=FDS7Rsunp4ieTPFh_T_LXvreNi5_HTv4ZzR3OnTcAX8,5013
 cloudnetpy/instruments/disdrometer.py,sha256=zzzdA4mwgZLSk9HfbVUQpaq7gDCWkQBArafrpbRnj1A,22754
 cloudnetpy/instruments/galileo.py,sha256=F_XyoAb9PR-ifGhqhXziKnv0KfyOh-yEBaE1NgRMzNg,4318
 cloudnetpy/instruments/hatpro.py,sha256=ftXVbYx2xtQcRZ2zVF82jUP7R96YV5Wdgcz_PUNZTXM,4824
 cloudnetpy/instruments/instruments.py,sha256=L4w5a87IBJngmfqIBaXEbHCdVco0dn9Aydz7MURoIUk,2873
 cloudnetpy/instruments/lufft.py,sha256=o6sY1L82EgfaBXBwFpomHmIz37cP8WHu0WDoiUROvyQ,3226
-cloudnetpy/instruments/mira.py,sha256=dfrQqoZ-G8AJiE6f1PNkzU-vRCQQq7NKCnrqe0aDexw,4881
+cloudnetpy/instruments/mira.py,sha256=wtcgTR_nqL_BPZ5yqvBYXpI9Qtwdvc_1v6N_r3hCEPc,4888
 cloudnetpy/instruments/nc_lidar.py,sha256=9FSsInEM8fdyyhgNXb2INBjb5OEGFE5ZaVSowHjzoCA,1386
-cloudnetpy/instruments/nc_radar.py,sha256=GDBoPN2rXjBTk80ydW3Gc3F974X4wzimWOtPKsf53Fc,5269
-cloudnetpy/instruments/pollyxt.py,sha256=QktbbsNHbSb2umd6KhbzpKRlXKB24B6e_1BAQXgc-p0,7849
+cloudnetpy/instruments/nc_radar.py,sha256=MsNHIlCVzQZyAjI9zSAHSMtt-F_4xzNcodqVoscu-1Y,5494
+cloudnetpy/instruments/pollyxt.py,sha256=Ezuq9rJxQREKz5ed1sdMsuqHZwlKMQC_w5CZSpzQQko,7847
 cloudnetpy/instruments/radiometrics.py,sha256=d9SYWq7YvPdmIPwVCbIrKimBvl0oRXFvT7D2JDBIzic,4335
 cloudnetpy/instruments/rpg.py,sha256=2ecgqgCAkwMQpBxypin-N62M1nNHmjH47KhjHxQF-7g,15656
 cloudnetpy/instruments/rpg_reader.py,sha256=GLvaMm6Zn-oOg4capCMh3j4UUDZcGXsdMAbbI7Fdjj0,10457
@@ -100,9 +100,9 @@ cloudnetpy/products/lwc.py,sha256=CqvV7iqxUbk2YekaocBActmZuhF1BhWkfc-y6MDej-0,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/product_tools.py,sha256=9eKvr-zGEK2ARN2DmJN--KbynKdT08DhfT1GB8Rfoe4,9616
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/e2e_test.py,sha256=hp3exUZnAX8x2kEi8e1QY6ffgTij8UboPAZNITkF07w,3857
-cloudnetpy-1.46.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.46.2.dist-info/METADATA,sha256=PW3SdYdWfGcfB9x11JR5BnO_jLySlkMuT_sdQRUzgPc,4135
-cloudnetpy-1.46.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cloudnetpy-1.46.2.dist-info/top_level.txt,sha256=-csBTtA3agkdZVDLjsdCzwh_9tKGWag53JTwpWVCvSo,17
-cloudnetpy-1.46.2.dist-info/RECORD,,
+tests/e2e_test.py,sha256=yd2dqFa0N7EAib6BuZuSRLHp1bZh5cta8I85B7DEaFA,3856
+cloudnetpy-1.46.4.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.46.4.dist-info/METADATA,sha256=-2oIRdXeQ5ZizdWyxZSpSgvBG89VDP9_QkpkqlDpXd8,4135
+cloudnetpy-1.46.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+cloudnetpy-1.46.4.dist-info/top_level.txt,sha256=-csBTtA3agkdZVDLjsdCzwh_9tKGWag53JTwpWVCvSo,17
+cloudnetpy-1.46.4.dist-info/RECORD,,

tests/e2e_test.py

@@ -20,7 +20,6 @@ def _process_product_file(product_type: str, path: str, categorize_file: str) ->
 
 
 def main():
-
     test_path = Path(__file__).parent
     source_path = f"{test_path}/source_data/"