cloudnetpy 1.69.0__py3-none-any.whl → 1.69.2__py3-none-any.whl

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/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/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/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/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 = 0
+PATCH = 2
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.69.0.dist-info → cloudnetpy-1.69.2.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.69.2.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=FqujXpPhly4sMRqVkoBdvTCkTm5g4vZ527GwQzZZ23g,72
+cloudnetpy/version.py,sha256=kxk8PWJBfD_V00eDZ4TB8QpJ5of0aDtwt7yHrIjjZeU,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
@@ -39,22 +39,22 @@ cloudnetpy/instruments/ceilo.py,sha256=xrI7iYNftKvGZf-3C_ESUNsu-QhXV43iWkDuKp3bi
 cloudnetpy/instruments/ceilometer.py,sha256=pdmLVljsuciyKpaGxWxJ_f1IrJK-UrkBC0lSeuirLlU,12095
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=086GJ6Nfp7sK9ZK8UygJOn-aiVPreez674_gbrOZj4I,5183
-cloudnetpy/instruments/copernicus.py,sha256=he15ncH6SDCidBhr0BkOJc6Rg8cMvLWN0vGmpui6nGQ,6611
-cloudnetpy/instruments/galileo.py,sha256=qABO3IUdRpGFDgqKsN0Pl4TQ-CWHQz8s13PxnwdIUnU,4828
+cloudnetpy/instruments/copernicus.py,sha256=99idcn6-iKOSvSslNjwFRng3gwlTLFjKPiT1tnVytpQ,6613
+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/mira.py,sha256=bTvXRqekh84hNnkBV8HKfFiaaFlUNLhQ8-BM15SfBE4,10727
+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
-cloudnetpy/instruments/nc_radar.py,sha256=AjPn3mkq5a1mE7YzKtZnxX5suNju9NhUq-TDvs7T_uU,6911
+cloudnetpy/instruments/nc_radar.py,sha256=vCk616cHDZPctcn42d2I21YUnlYEqBkK1y2tY1A9dkA,7279
 cloudnetpy/instruments/pollyxt.py,sha256=ra7sYQ_cmkC0T9TBYrMN6iiQEZimmWGdW9Ilv61JB-Q,10027
 cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
 cloudnetpy/instruments/rain_e_h3.py,sha256=IY-ytMjQUV94qMQgIXMJsPXe6oF3yk-d9LIbN19ogv0,5376
 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.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.69.0.dist-info/METADATA,sha256=Z7Fidx0_ymAob75YLglh7Y7ugOWbipLZxSAq9XWOi7A,5793
-cloudnetpy-1.69.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudnetpy-1.69.0.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.69.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.69.0.dist-info/RECORD,,
+cloudnetpy-1.69.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.69.2.dist-info/METADATA,sha256=CPzESCxmNHXYoaTXc39qwMDmK8n_edhp7Q7zDeTN1KQ,5793
+cloudnetpy-1.69.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudnetpy-1.69.2.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.69.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.69.2.dist-info/RECORD,,