cloudnetpy 1.86.4__tar.gz → 1.86.6__tar.gz

{cloudnetpy-1.86.4/cloudnetpy.egg-info → cloudnetpy-1.86.6}/PKG-INFO

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

{cloudnetpy-1.86.4 → cloudnetpy-1.86.6}/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,15 @@ 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")
+        zed_hc = self.dataset.variables["ZED_HC"]
+        offset_applied = getattr(zed_hc, "applied_calibration_offset", 0)
+
+        # Estimated by comparing with MIRA-35 2021 data:
+        default_offset = -149.5
+        zh_offset = self.site_meta.get("Zh_offset", default_offset)
+
+        self.data["Zh"].data[:] = self.data["Zh"].data[:] - offset_applied + 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 +174,16 @@ class Copernicus(ChilboltonRadar):
 
 
 ATTRIBUTES = {
-    "calibration_offset": MetaData(
+    "Zh_offset": MetaData(
         long_name="Radar reflectivity calibration offset",
         units="dBZ",
-        comment="Calibration offset applied.",
+        comment=(
+            "Calibration offset applied after removing the original offset "
+            "from the raw files."
+        ),
         dimensions=None,
     ),
+    "Zh": COMMON_ATTRIBUTES["Zh"]._replace(ancillary_variables="Zh_offset"),
     "range_offset": MetaData(
         long_name="Radar range offset",
         units="m",

{cloudnetpy-1.86.4 → cloudnetpy-1.86.6}/cloudnetpy/version.py

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

{cloudnetpy-1.86.4 → cloudnetpy-1.86.6/cloudnetpy.egg-info}/PKG-INFO

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