cloudnetpy 1.71.6__tar.gz → 1.72.1__tar.gz

{cloudnetpy-1.71.6/cloudnetpy.egg-info → cloudnetpy-1.72.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.71.6
+Version: 1.72.1
 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 → cloudnetpy-1.72.1}/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-1.71.6 → cloudnetpy-1.72.1}/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,72 @@ 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)
+            ):
+                data = None
+                if (
+                    hasattr(self, "dataset")
+                    and isinstance(self.dataset, netCDF4.Dataset)
+                    and key in self.dataset.variables
+                ):
+                    data = self.dataset[key][:]
+                elif key in self.data:
+                    data = self.data[key].data
+                if data is not None and not np.all(ma.getmaskarray(data)):
+                    value = data
+                    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-1.71.6 → cloudnetpy-1.72.1}/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-1.71.6 → cloudnetpy-1.72.1}/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-1.71.6 → cloudnetpy-1.72.1}/cloudnetpy/version.py

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

{cloudnetpy-1.71.6 → cloudnetpy-1.72.1/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.71.6
+Version: 1.72.1
 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 → cloudnetpy-1.72.1}/cloudnetpy.egg-info/requires.txt

@@ -1,5 +1,4 @@
 ceilopyter
-cloudnetpy_qc>=1.15.0
 doppy>=0.5.0
 matplotlib
 mwrpy>=1.2.0
@@ -17,6 +16,7 @@ release-version
 voodoonet>=0.1.7
 
 [test]
+cloudnetpy_qc
 mypy
 pytest
 pytest-flakefinder

{cloudnetpy-1.71.6 → cloudnetpy-1.72.1}/pyproject.toml

@@ -15,7 +15,6 @@ classifiers = [
 ]
 dependencies = [
   "ceilopyter",
-  "cloudnetpy_qc>=1.15.0",
   "doppy>=0.5.0",
   "matplotlib",
   "mwrpy>=1.2.0",
@@ -29,6 +28,7 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 test = [
+  "cloudnetpy_qc",
   "mypy",
   "pytest",
   "pytest-flakefinder",