cloudnetpy 1.72.2__py3-none-any.whl → 1.72.3__py3-none-any.whl

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

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

{cloudnetpy-1.72.2.dist-info → cloudnetpy-1.72.3.dist-info}/METADATA

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

@@ -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=BtuV33bUwNC3aqZLwqUU4LXvhJ0WO9OsQbaPQEj2myA,72
+cloudnetpy/version.py,sha256=VZyDjYqkZF5bawPUyoO9efabZW4A0aKtVUmrLqcEnGE,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=0yA8qtlCfjeLtSVpsrMSC8fwZzg_np2a2vRcq2Q79oA,6935
+cloudnetpy/instruments/cloudnet_instrument.py,sha256=3lKAhGd6RZx9tuyX86uJTrrkdHNRmICsmk0ZV7TkE5Q,6954
 cloudnetpy/instruments/copernicus.py,sha256=99idcn6-iKOSvSslNjwFRng3gwlTLFjKPiT1tnVytpQ,6613
 cloudnetpy/instruments/galileo.py,sha256=BjWE15_S3tTCOmAM5k--oicI3wghKaO0hv9EUBxtbl8,4830
-cloudnetpy/instruments/hatpro.py,sha256=tIwnwM3MmtmR-LrDbUlanoXAze8Y0Pnmvx5jhLdId7Q,9092
+cloudnetpy/instruments/hatpro.py,sha256=_k6vZzgI9BUQ9Razge2IdaQEdrhT3tCxnplU2p5ijPc,9629
 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
@@ -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.72.2.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.72.3.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.72.2.dist-info/METADATA,sha256=-ghMOCfGJeLwiSHAU3cHY8fKan77DiKabJtlblp0SoA,5796
-cloudnetpy-1.72.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloudnetpy-1.72.2.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.72.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.72.2.dist-info/RECORD,,
+cloudnetpy-1.72.3.dist-info/METADATA,sha256=eKefOUz7gfLWg1dMP0-2GqIkWGPzjinAVmdzO05iNOs,5796
+cloudnetpy-1.72.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloudnetpy-1.72.3.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.72.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.72.3.dist-info/RECORD,,