cloudnetpy 1.72.2__tar.gz → 1.72.3__tar.gz

{cloudnetpy-1.72.2/cloudnetpy.egg-info → cloudnetpy-1.72.3}/PKG-INFO

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

{cloudnetpy-1.72.2 → cloudnetpy-1.72.3}/cloudnetpy/instruments/cloudnet_instrument.py

@@ -7,7 +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
+from cloudnetpy.instruments.instruments import BASTA, FMCW35, FMCW94, Instrument
 
 
 class CloudnetInstrument:
@@ -23,12 +23,13 @@ class CloudnetInstrument:
         for key in ("latitude", "longitude", "altitude"):
             value = None
             source = None
-            # From source data (BASTA, RPG-FMCW, HATPRO).
+            # From source data (BASTA, RPG-FMCW).
             # Should be the accurate GPS coordinates.
+            # HATPRO is handled elsewhere.
             if (
                 value is None
                 and self.instrument is not None
-                and self.instrument in (BASTA, FMCW94, FMCW35, HATPRO)
+                and self.instrument in (BASTA, FMCW94, FMCW35)
             ):
                 data = None
                 if (

{cloudnetpy-1.72.2 → cloudnetpy-1.72.3}/cloudnetpy/instruments/hatpro.py

@@ -106,9 +106,21 @@ def hatpro2l1c(
     if "irt" in hatpro.data:
         hatpro.data["irt"].dimensions = ("time", "ir_channel")
 
-    for key in ("latitude", "longitude", "altitude"):
-        value = float(ma.mean(hatpro.data[key].data))
-        hatpro.data[key] = CloudnetArray(value, key)
+    lat = hatpro.data["latitude"].data
+    lon = hatpro.data["longitude"].data
+    valid_latlon = (lat != 0) | (lon != 0)
+    if np.any(valid_latlon):
+        lat = float(ma.mean(lat[valid_latlon]))
+        lon = float(ma.mean(lon[valid_latlon]))
+        latlon_source = "GPS"
+    else:
+        lat = site_meta["latitude"]
+        lon = site_meta["longitude"]
+        latlon_source = "site coordinates"
+    alt = float(site_meta["altitude"])
+    hatpro.data["latitude"] = CloudnetArray(lat, "latitude", source=latlon_source)
+    hatpro.data["longitude"] = CloudnetArray(lon, "longitude", source=latlon_source)
+    hatpro.data["altitude"] = CloudnetArray(alt, "altitude", source="site coordinates")
 
     attrs_copy = ATTRIBUTES_1B01.copy()
     attributes = output.add_time_attribute(attrs_copy, hatpro.date)

{cloudnetpy-1.72.2 → cloudnetpy-1.72.3}/cloudnetpy/version.py

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

{cloudnetpy-1.72.2 → cloudnetpy-1.72.3/cloudnetpy.egg-info}/PKG-INFO

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