cloudnetpy 1.86.3__tar.gz → 1.86.5__tar.gz

{cloudnetpy-1.86.3/cloudnetpy.egg-info → cloudnetpy-1.86.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.86.3
+Version: 1.86.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.86.3 → cloudnetpy-1.86.5}/cloudnetpy/instruments/copernicus.py

@@ -12,7 +12,7 @@ import numpy as np
 from cloudnetpy import concat_lib, output, utils
 from cloudnetpy.instruments.instruments import COPERNICUS
 from cloudnetpy.instruments.nc_radar import ChilboltonRadar
-from cloudnetpy.metadata import MetaData
+from cloudnetpy.metadata import COMMON_ATTRIBUTES, MetaData
 
 
 def copernicus2nc(
@@ -105,7 +105,7 @@ def copernicus2nc(
             copernicus.add_site_geolocation()
             valid_indices = copernicus.add_zenith_and_azimuth_angles(
                 elevation_threshold=1.1,
-                elevation_diff_threshold=0.1,
+                elevation_diff_threshold=0.5,
                 azimuth_diff_threshold=0.1,
             )
             copernicus.screen_time_indices(valid_indices)
@@ -131,10 +131,12 @@ class Copernicus(ChilboltonRadar):
         self.instrument = COPERNICUS
 
     def calibrate_reflectivity(self) -> None:
-        default_offset = -146.8  # TODO: check this value
-        calibration_factor = self.site_meta.get("calibration_offset", default_offset)
-        self.data["Zh"].data[:] += calibration_factor
-        self.append_data(np.array(calibration_factor), "calibration_offset")
+        default_offset = (
+            -141.5
+        )  # Taken from 2016-01 raw files where this was already applied
+        zh_offset = self.site_meta.get("Zh_offset", default_offset)
+        self.data["Zh"].data[:] += zh_offset
+        self.append_data(np.array(zh_offset, dtype=np.float32), "Zh_offset")
 
     def mask_corrupted_values(self) -> None:
         """Experimental masking of corrupted Copernicus data.
@@ -169,12 +171,13 @@ class Copernicus(ChilboltonRadar):
 
 
 ATTRIBUTES = {
-    "calibration_offset": MetaData(
+    "Zh_offset": MetaData(
         long_name="Radar reflectivity calibration offset",
         units="dBZ",
         comment="Calibration offset applied.",
         dimensions=None,
     ),
+    "Zh": COMMON_ATTRIBUTES["Zh"]._replace(ancillary_variables="Zh_offset"),
     "range_offset": MetaData(
         long_name="Radar range offset",
         units="m",

{cloudnetpy-1.86.3 → cloudnetpy-1.86.5}/cloudnetpy/instruments/galileo.py

@@ -92,6 +92,7 @@ def galileo2nc(
                 galileo.check_date(date)
             galileo.sort_timestamps()
             galileo.remove_duplicate_timestamps()
+            galileo.screen_negative_altitudes()
             snr_limit = site_meta.get("snr_limit", 3)
             galileo.screen_by_snr(snr_limit=snr_limit)
             galileo.mask_clutter()
@@ -128,7 +129,6 @@ class Galileo(ChilboltonRadar):
         self.instrument = GALILEO
 
     def mask_clutter(self) -> None:
-        """Masks clutter."""
         # Only strong Z values are valid
         n_low_gates = 15
         ind = np.where(self.data["Zh"][:, :n_low_gates] < -15) and np.where(
@@ -136,6 +136,20 @@ class Galileo(ChilboltonRadar):
         )
         self.data["v"].mask_indices(ind)
 
+    def screen_negative_altitudes(self) -> None:
+        range_var = self.data["range"][:]
+        valid_idx = np.where(range_var > 0)[0]
+        if valid_idx.size == 0:
+            msg = "No valid altitudes found."
+            raise ValueError(msg)
+        if valid_idx.size == range_var.shape[0]:
+            return
+        for arr in self.data.values():
+            if utils.isscalar(arr.data):
+                continue
+            if arr[:].shape[-1] == range_var.shape[0]:
+                arr.data = arr[..., valid_idx]
+
 
 ATTRIBUTES = {
     "antenna_diameter": MetaData(

{cloudnetpy-1.86.3 → cloudnetpy-1.86.5}/cloudnetpy/version.py

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

{cloudnetpy-1.86.3 → cloudnetpy-1.86.5/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.86.3
+Version: 1.86.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License