cloudnetpy 1.69.1__tar.gz → 1.69.3__tar.gz

{cloudnetpy-1.69.1/cloudnetpy.egg-info → cloudnetpy-1.69.3}/PKG-INFO

@@ -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 → cloudnetpy-1.69.3}/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-1.69.1 → cloudnetpy-1.69.3}/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-1.69.1 → cloudnetpy-1.69.3}/cloudnetpy/version.py

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

{cloudnetpy-1.69.1 → cloudnetpy-1.69.3/cloudnetpy.egg-info}/PKG-INFO

@@ -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