cloudnetpy 1.71.6__py3-none-any.whl → 1.72.0__py3-none-any.whl

cloudnetpy/cloudnetarray.py

@@ -21,6 +21,7 @@ class CloudnetArray:
         units_from_user: Explicit units, optional.
         dimensions: Explicit dimension names, optional.
         data_type: Explicit data type, optional.
+        source: Source attribute, optional.
 
     """
 
@@ -31,6 +32,7 @@ class CloudnetArray:
         units_from_user: str | None = None,
         dimensions: Sequence[str] | None = None,
         data_type: str | None = None,
+        source: str | None = None,
     ):
         self.variable = variable
         self.name = name
@@ -38,6 +40,7 @@ class CloudnetArray:
         self.units = units_from_user or self._init_units()
         self.data_type = data_type or self._init_data_type()
         self.dimensions = dimensions
+        self.source = source
 
     def lin2db(self) -> None:
         """Converts linear units to log."""
@@ -83,15 +86,19 @@ class CloudnetArray:
     def fetch_attributes(self) -> list:
         """Returns list of user-defined attributes."""
         attributes = []
-        for attr in self.__dict__:
-            if attr not in (
-                "variable",
-                "name",
-                "data",
-                "data_type",
-                "dimensions",
+        for key, value in self.__dict__.items():
+            if (
+                key
+                not in (
+                    "variable",
+                    "name",
+                    "data",
+                    "data_type",
+                    "dimensions",
+                )
+                and value is not None
             ):
-                attributes.append(attr)
+                attributes.append(key)
         return attributes
 
     def set_attributes(self, attributes: MetaData) -> None:

cloudnetpy/instruments/cloudnet_instrument.py

@@ -7,6 +7,7 @@ from numpy import ma
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.instruments.instruments import BASTA, FMCW35, FMCW94, HATPRO, Instrument
 
 
 class CloudnetInstrument:
@@ -16,37 +17,66 @@ class CloudnetInstrument:
         self.site_meta: dict = {}
         self.data: dict = {}
         self.serial_number: str | None = None
+        self.instrument: Instrument | None = None
 
     def add_site_geolocation(self) -> None:
         for key in ("latitude", "longitude", "altitude"):
             value = None
-            # User-supplied:
-            if key in self.site_meta:
+            source = None
+            # From source data (BASTA, RPG-FMCW, HATPRO).
+            # Should be the accurate GPS coordinates.
+            if (
+                value is None
+                and self.instrument is not None
+                and self.instrument in (BASTA, FMCW94, FMCW35, HATPRO)
+                and hasattr(self, "dataset")
+                and isinstance(self.dataset, netCDF4.Dataset)
+                and key in self.dataset.variables
+                and not np.all(ma.getmaskarray(self.dataset[key][:]))
+            ):
+                value = self.dataset[key][:]
+                source = "GPS"
+            # User-supplied site coordinate.
+            if value is None and key in self.site_meta:
                 value = self.site_meta[key]
-            # From source global attributes (MIRA):
-            elif (
-                hasattr(self, "dataset")
+                source = "site coordinates"
+            # From source data (CHM15k, CL61, MRR-PRO, Copernicus, Galileo...).
+            # Assume value is manually set, so cannot trust it.
+            if (
+                value is None
+                and hasattr(self, "dataset")
+                and isinstance(self.dataset, netCDF4.Dataset)
+                and key in self.dataset.variables
+                and not np.all(ma.getmaskarray(self.dataset[key][:]))
+            ):
+                value = self.dataset[key][:]
+                source = "raw file"
+            # From source global attributes (MIRA).
+            # Seems to be manually set, so cannot trust it.
+            if (
+                value is None
+                and hasattr(self, "dataset")
                 and isinstance(self.dataset, netCDF4.Dataset)
                 and hasattr(
                     self.dataset,
                     key.capitalize(),
                 )
             ):
-                value = self.parse_global_attribute_numeral(key.capitalize())
-            # From source data (BASTA / RPG):
-            elif (
-                hasattr(self, "dataset")
-                and isinstance(self.dataset, netCDF4.Dataset)
-                and key in self.dataset.variables
-            ):
-                value = self.dataset.variables[key][:]
+                value = self._parse_global_attribute_numeral(key.capitalize())
+                source = "raw file"
             if value is not None:
                 value = float(ma.mean(value))
-                self.data[key] = CloudnetArray(value, key)
+                # Convert from 0...360 to -180...180
+                if key == "longitude" and value > 180:
+                    value -= 360
+                self.data[key] = CloudnetArray(value, key, source=source)
 
-    def parse_global_attribute_numeral(self, key: str) -> float:
+    def _parse_global_attribute_numeral(self, key: str) -> float | None:
         new_str = ""
-        for char in getattr(self.dataset, key):
+        attr = getattr(self.dataset, key)
+        if attr == "Unknown":
+            return None
+        for char in attr:
             if char.isdigit() or char == ".":
                 new_str += char
         return float(new_str)

cloudnetpy/instruments/hatpro.py

@@ -107,8 +107,8 @@ def hatpro2l1c(
         hatpro.data["irt"].dimensions = ("time", "ir_channel")
 
     for key in ("latitude", "longitude", "altitude"):
-        if key in site_meta:
-            hatpro.data[key] = CloudnetArray(site_meta[key], key, data_type="f4")
+        value = float(ma.mean(hatpro.data[key].data))
+        hatpro.data[key] = CloudnetArray(value, key)
 
     attrs_copy = ATTRIBUTES_1B01.copy()
     attributes = output.add_time_attribute(attrs_copy, hatpro.date)

cloudnetpy/instruments/rpg.py

@@ -157,8 +157,13 @@ def _mask_invalid_data(data_in: dict) -> dict:
     """Masks zeros and other fill values from data."""
     data = data_in.copy()
     fill_values = (-999, 1e-10)
+    extra_keys = ("air_temperature", "air_pressure")
     for name in data:
-        if np.issubdtype(data[name].dtype, np.integer) or data[name].ndim < 2:
+        if (
+            np.issubdtype(data[name].dtype, np.integer)
+            or data[name].ndim < 2
+            and name not in extra_keys
+        ):
             continue
         data[name] = ma.masked_equal(data[name], 0)
         for value in fill_values:

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 71
-PATCH = 6
+MINOR = 72
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.71.6.dist-info → cloudnetpy-1.72.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.71.6
+Version: 1.72.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License
@@ -39,7 +39,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ceilopyter
-Requires-Dist: cloudnetpy_qc>=1.15.0
 Requires-Dist: doppy>=0.5.0
 Requires-Dist: matplotlib
 Requires-Dist: mwrpy>=1.2.0
@@ -49,6 +48,7 @@ Requires-Dist: rpgpy>=0.14.5
 Requires-Dist: scikit-image
 Requires-Dist: scipy
 Provides-Extra: test
+Requires-Dist: cloudnetpy_qc; extra == "test"
 Requires-Dist: mypy; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-flakefinder; extra == "test"

{cloudnetpy-1.71.6.dist-info → cloudnetpy-1.72.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudnetpy/__init__.py,sha256=X_FqY-4yg5GUj5Edo14SToLEos6JIsC3fN-v1FUgQoA,43
 cloudnetpy/cli.py,sha256=lHkeAErmAijI-Ugpd4DHRHfbZP4SXOake0LIY5Ovv_Q,20782
-cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7077
+cloudnetpy/cloudnetarray.py,sha256=XFyXZwR4QWPyo7WLmvsu7DEELZQp1vi5FZ8F7tX_tM0,7307
 cloudnetpy/concat_lib.py,sha256=jcLppqAmVHVkykcXBcpwUr8MS_k8v2Xl2xBLmVRE_DI,12624
 cloudnetpy/constants.py,sha256=YnoSzZm35NDooJfhlulSJBc7g0eSchT3yGytRaTaJEI,845
 cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=BDEpgwZ58PHznc1gi11gtNNV4kFiMAmlHnF4huTy7nw,5982
 cloudnetpy/output.py,sha256=l0LoOhcGCBrg2EJ4NT1xZ7-UKWdV7X7yQ0fJmhkwJVc,15829
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=U0iMIKPiKLrLVAfs_u9pPuoWYW1RJHcM8dbLF9a4yIA,29796
-cloudnetpy/version.py,sha256=pDKpD1o6SpJO_mS4pVMyx1Z1y_3N7-u7uMi7mxGXhP8,72
+cloudnetpy/version.py,sha256=kFJ4NpGbsPUkAabAFn0Zr_V6oQtTzD-3Hp7JR7KGy50,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
@@ -37,10 +37,10 @@ cloudnetpy/instruments/basta.py,sha256=Lb_EhQTI93S5Bd9osDbCE_tC8gZreRsHz7D2_dFOj
 cloudnetpy/instruments/ceilo.py,sha256=rkP6Vo90eS5ZhnKxZpnkuiG5ZEP86lDK8zRqoMY1aqg,9498
 cloudnetpy/instruments/ceilometer.py,sha256=pdmLVljsuciyKpaGxWxJ_f1IrJK-UrkBC0lSeuirLlU,12095
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
-cloudnetpy/instruments/cloudnet_instrument.py,sha256=086GJ6Nfp7sK9ZK8UygJOn-aiVPreez674_gbrOZj4I,5183
+cloudnetpy/instruments/cloudnet_instrument.py,sha256=P9r0gzBx_gdW46vzOH1zDYpfVsEdjJLwDqziZG92o9g,6615
 cloudnetpy/instruments/copernicus.py,sha256=99idcn6-iKOSvSslNjwFRng3gwlTLFjKPiT1tnVytpQ,6613
 cloudnetpy/instruments/galileo.py,sha256=BjWE15_S3tTCOmAM5k--oicI3wghKaO0hv9EUBxtbl8,4830
-cloudnetpy/instruments/hatpro.py,sha256=7DFULGywPru6tb9LwTl43XJTTfn7yGsHAdW9FY_zw1c,9096
+cloudnetpy/instruments/hatpro.py,sha256=tIwnwM3MmtmR-LrDbUlanoXAze8Y0Pnmvx5jhLdId7Q,9092
 cloudnetpy/instruments/instruments.py,sha256=97hHMjp8fp2IKihr0XJYY3BrOlBArU7gYwYmt3OxqvU,4124
 cloudnetpy/instruments/lufft.py,sha256=nIoEKuuFGKq2dLqkX7zW-HpAifefG472tZhKfXE1yoA,4212
 cloudnetpy/instruments/mira.py,sha256=Wofp8HbiAwJce_IbOLjpEFV07H_Kh4170C9Wygiz-ew,11401
@@ -50,7 +50,7 @@ cloudnetpy/instruments/nc_radar.py,sha256=HlaZeH5939R86ukF8K-P4Kfzb5-CpLB15LU2u9
 cloudnetpy/instruments/pollyxt.py,sha256=ra7sYQ_cmkC0T9TBYrMN6iiQEZimmWGdW9Ilv61JB-Q,10027
 cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
 cloudnetpy/instruments/rain_e_h3.py,sha256=9TdpP4UzMBNIt2iE2GL6K9dFldzTHPLOrU8Q3tcosCU,5317
-cloudnetpy/instruments/rpg.py,sha256=vfs_eGahPOxFjOIBczNywRwtdutOsJpSNeXZm99SIOo,17438
+cloudnetpy/instruments/rpg.py,sha256=gEQd-yICUoikQnHVpikpHppUrwekdTuIf9Mk1jGxgCY,17566
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=RKAw_fVry4YOUF0i2_-2jLIc6_H85oL8USA4ji9rh0o,4583
@@ -115,10 +115,10 @@ cloudnetpy/products/lwc.py,sha256=sl6Al2tuH3KkCBrPbWTmuz3jlD5UQJ4D6qBsn1tt2CQ,18
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
-cloudnetpy-1.71.6.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.72.0.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.71.6.dist-info/METADATA,sha256=i-Sofs6QArvcbi7NqFIOJPPpt6HU_TX7GQB6FpL_0nQ,5787
-cloudnetpy-1.71.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloudnetpy-1.71.6.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.71.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.71.6.dist-info/RECORD,,
+cloudnetpy-1.72.0.dist-info/METADATA,sha256=VVJsfXfV-GMlu84TBWTAHTSzDwJlt7-q3U_RTnSthAE,5796
+cloudnetpy-1.72.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloudnetpy-1.72.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.72.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.72.0.dist-info/RECORD,,