cloudnetpy 1.69.1__py3-none-any.whl → 1.69.3__py3-none-any.whl

cloudnetpy/instruments/lufft.py

@@ -3,6 +3,7 @@
 import logging
 
 import netCDF4
+import numpy as np
 from numpy import ma
 
 from cloudnetpy import utils
@@ -61,9 +62,19 @@ class LufftCeilo(NcLidar):
             msg = "No dataset found"
             raise RuntimeError(msg)
         version = self.dataset.software_version
-        if len(str(version)) > 4:
+        # In old files, the version is a single integer.
+        if isinstance(version, np.integer):
+            return str(version)
+        # In newer files, the version is a space-separated list: Operating
+        # system, FPGA, firmware, CloudDetectionMode (added in firmware 0.747).
+        if isinstance(version, str):
+            parts = version.split()
+            firmware = parts[2]
+            if firmware < "0.702":
+                return firmware
             return None
-        return version
+        msg = f"Cannot determine version: {version}"
+        raise RuntimeError(msg)
 
     def _get_nn(self) -> float | ma.MaskedArray:
         nn1 = self._getvar("nn1", "NN1")

cloudnetpy/instruments/vaisala.py

@@ -224,6 +224,23 @@ class VaisalaCeilo(Ceilometer):
         values = [[line[0], line[1], line[3:20], line[21:].strip()] for line in lines]
         return values_to_dict(fields, values)
 
+    def _sort_time(self) -> None:
+        """Sorts timestamps and removes duplicates."""
+        time = np.copy(self.data["time"][:])
+        ind_sorted = np.argsort(time)
+        ind_valid: list[int] = []
+        for ind in ind_sorted:
+            if time[ind] not in time[ind_valid]:
+                ind_valid.append(ind)
+        n_time = len(time)
+        for key, array in self.data.items():
+            if not hasattr(array, "shape"):
+                continue
+            if array.ndim == 1 and array.shape[0] == n_time:
+                self.data[key] = self.data[key][ind_valid]
+            if array.ndim == 2 and array.shape[0] == n_time:
+                self.data[key] = self.data[key][ind_valid, :]
+
 
 class ClCeilo(VaisalaCeilo):
     """Base class for Vaisala CL31/CL51 ceilometers."""
@@ -253,23 +270,6 @@ class ClCeilo(VaisalaCeilo):
         self._store_ceilometer_info()
         self._sort_time()
 
-    def _sort_time(self) -> None:
-        """Sorts timestamps and removes duplicates."""
-        time = np.copy(self.data["time"][:])
-        ind_sorted = np.argsort(time)
-        ind_valid: list[int] = []
-        for ind in ind_sorted:
-            if time[ind] not in time[ind_valid]:
-                ind_valid.append(ind)
-        n_time = len(time)
-        for key, array in self.data.items():
-            if not hasattr(array, "shape"):
-                continue
-            if array.ndim == 1 and array.shape[0] == n_time:
-                self.data[key] = self.data[key][ind_valid]
-            if array.ndim == 2 and array.shape[0] == n_time:
-                self.data[key] = self.data[key][ind_valid, :]
-
     def _store_ceilometer_info(self) -> None:
         n_gates = self.data["beta_raw"].shape[1]
         if n_gates < 1540:
@@ -335,6 +335,7 @@ class Ct25k(VaisalaCeilo):
         self.data["calibration_factor"] = calibration_factor or 1.0
         self.data["beta_raw"] *= self.data["calibration_factor"]
         self.data["zenith_angle"] = np.median(self.metadata["zenith_angle"])
+        self._sort_time()
 
     @staticmethod
     def _parse_hex_profiles(lines: list) -> list:

cloudnetpy/version.py

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

{cloudnetpy-1.69.1.dist-info → cloudnetpy-1.69.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.1
+Version: 1.69.3
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.69.1.dist-info → cloudnetpy-1.69.3.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=gEHwqEMY9gfaqVxx2_CobLg3i5gFXAumXLwnnW4BqtU,5840
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=U0iMIKPiKLrLVAfs_u9pPuoWYW1RJHcM8dbLF9a4yIA,29796
-cloudnetpy/version.py,sha256=pFeW4Wzfw3a64XhtkMDkuR0DY_1U2RuZ8jQjlU8NQoY,72
+cloudnetpy/version.py,sha256=s3qS3MvUe9BkH1YWIU_aE7D5my0nvAXQg8WL0GhkNrM,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
@@ -43,7 +43,7 @@ cloudnetpy/instruments/copernicus.py,sha256=99idcn6-iKOSvSslNjwFRng3gwlTLFjKPiT1
 cloudnetpy/instruments/galileo.py,sha256=BjWE15_S3tTCOmAM5k--oicI3wghKaO0hv9EUBxtbl8,4830
 cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
 cloudnetpy/instruments/instruments.py,sha256=97hHMjp8fp2IKihr0XJYY3BrOlBArU7gYwYmt3OxqvU,4124
-cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
+cloudnetpy/instruments/lufft.py,sha256=nIoEKuuFGKq2dLqkX7zW-HpAifefG472tZhKfXE1yoA,4212
 cloudnetpy/instruments/mira.py,sha256=RQGJHP00Co_23UocsBw70afX-VqtM9pXQcsGgzj_n2s,11206
 cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
@@ -54,7 +54,7 @@ cloudnetpy/instruments/rain_e_h3.py,sha256=IY-ytMjQUV94qMQgIXMJsPXe6oF3yk-d9LIbN
 cloudnetpy/instruments/rpg.py,sha256=vfs_eGahPOxFjOIBczNywRwtdutOsJpSNeXZm99SIOo,17438
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
-cloudnetpy/instruments/vaisala.py,sha256=GGuA_v4S7kR9yApSr1-d0ETzNj4ehEZ7-pD1-AdPYRE,14662
+cloudnetpy/instruments/vaisala.py,sha256=MA6hAlanFrxJlF4suDxLt5FyjcSSzJg-SWRnkLQpu3E,14688
 cloudnetpy/instruments/weather_station.py,sha256=jSu9sY2LYV1ssWcuLr6kiF8EEqGW29mywE9UUZccac0,18720
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
@@ -116,9 +116,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.69.1.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.69.1.dist-info/METADATA,sha256=qZFPRPyi7praz82q6Fht36hury-NYSrjwEk1Im8jdZE,5793
-cloudnetpy-1.69.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudnetpy-1.69.1.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.69.1.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.69.1.dist-info/RECORD,,
+cloudnetpy-1.69.3.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.69.3.dist-info/METADATA,sha256=B6Kfj96CtRWS992YcKBtEfb2jJjo9LjqE4SF7mCpW0c,5793
+cloudnetpy-1.69.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudnetpy-1.69.3.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.69.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.69.3.dist-info/RECORD,,