cloudnetpy 1.69.0__tar.gz → 1.69.2__tar.gz

{cloudnetpy-1.69.0/cloudnetpy.egg-info → cloudnetpy-1.69.2}/PKG-INFO

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

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2}/cloudnetpy/instruments/copernicus.py

@@ -97,7 +97,7 @@ def copernicus2nc(
             copernicus.add_nyquist_velocity(keymap)
             copernicus.add_site_geolocation()
             valid_indices = copernicus.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=0.1,
                 azimuth_diff_threshold=0.1,
             )

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2}/cloudnetpy/instruments/galileo.py

@@ -93,7 +93,7 @@ def galileo2nc(
             galileo.add_nyquist_velocity(keymap)
             galileo.add_site_geolocation()
             valid_indices = galileo.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=0.1,
                 azimuth_diff_threshold=0.1,
             )

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2}/cloudnetpy/instruments/mira.py

@@ -87,9 +87,11 @@ def mira2nc(
             mira.add_site_geolocation()
             mira.add_radar_specific_variables()
             valid_indices = mira.add_zenith_and_azimuth_angles(
-                elevation_threshold=1,
+                elevation_threshold=1.1,
                 elevation_diff_threshold=1e-6,
                 azimuth_diff_threshold=1e-3,
+                zenith_offset=site_meta.get("zenith_offset"),
+                azimuth_offset=site_meta.get("azimuth_offset"),
             )
             mira.screen_time_indices(valid_indices)
             mira.add_height()
@@ -298,4 +300,14 @@ ATTRIBUTES = {
         long_name="Pulse Repetition Frequency",
         units="Hz",
     ),
+    "zenith_offset": MetaData(
+        long_name="Zenith offset of the instrument",
+        units="degrees",
+        comment="Zenith offset applied.",
+    ),
+    "azimuth_offset": MetaData(
+        long_name="Azimuth offset of the instrument (positive clockwise from north)",
+        units="degrees",
+        comment="Azimuth offset applied.",
+    ),
 }

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2}/cloudnetpy/instruments/nc_radar.py

@@ -95,12 +95,21 @@ class NcRadar(DataSource, CloudnetInstrument):
         elevation_threshold: float,
         elevation_diff_threshold: float,
         azimuth_diff_threshold: float,
+        zenith_offset: float | None = None,
+        azimuth_offset: float | None = None,
     ) -> list:
         """Adds non-varying instrument zenith and azimuth angles and returns valid
         time indices.
         """
         elevation = self.data["elevation"].data
+        if zenith_offset is not None:
+            self.append_data(zenith_offset, "zenith_offset")
+            elevation -= zenith_offset
+
         azimuth = self.data["azimuth_angle"].data
+        if azimuth_offset is not None:
+            self.append_data(azimuth_offset, "azimuth_offset")
+            azimuth += azimuth_offset
 
         elevation_diff = ma.diff(elevation, prepend=elevation[1])
         azimuth_diff = ma.diff(azimuth, prepend=azimuth[1])

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2}/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.0 → cloudnetpy-1.69.2}/cloudnetpy/version.py

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

{cloudnetpy-1.69.0 → cloudnetpy-1.69.2/cloudnetpy.egg-info}/PKG-INFO

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