cloudnetpy 1.86.5__tar.gz → 1.86.7__tar.gz

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

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

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

@@ -131,13 +131,29 @@ class Copernicus(ChilboltonRadar):
         self.instrument = COPERNICUS
 
     def calibrate_reflectivity(self) -> None:
-        default_offset = (
-            -141.5
-        )  # Taken from 2016-01 raw files where this was already applied
+        zed_hc = self.dataset["ZED_HC"]
+        offset_applied = getattr(zed_hc, "applied_calibration_offset", 0)
+
+        # Estimated by comparing with MIRA-35 data:
+        default_offset = -149.5
         zh_offset = self.site_meta.get("Zh_offset", default_offset)
-        self.data["Zh"].data[:] += zh_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 fix_range_offset(self, site_meta: dict) -> None:
+        range_var = self.dataset["range"]
+        offset_applied = getattr(range_var, "range_offset", 0)
+
+        # Estimated by comparing with MIRA-35 data:
+        default_offset = -720
+        range_offset = site_meta.get("range_offset", default_offset)
+
+        self.data["range"].data[:] = (
+            self.data["range"].data[:] - offset_applied + range_offset
+        )
+        self.append_data(np.array(range_offset, dtype=float), "range_offset")
+
     def mask_corrupted_values(self) -> None:
         """Experimental masking of corrupted Copernicus data.
 
@@ -150,12 +166,6 @@ class Copernicus(ChilboltonRadar):
             ind = np.where(np.abs(self.data[key][:]) > value)
             self.data["v"].mask_indices(ind)
 
-    def fix_range_offset(self, site_meta: dict) -> None:
-        """Fixes range offset."""
-        range_offset = site_meta.get("range_offset", 0)
-        self.data["range"].data[:] += range_offset
-        self.append_data(np.array(range_offset, dtype=float), "range_offset")
-
     def screen_negative_ranges(self) -> None:
         """Screens negative range values."""
         valid_ind = np.where(self.data["range"][:] >= 0)[0]
@@ -174,16 +184,23 @@ ATTRIBUTES = {
     "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",
-        comment="Range offset applied.",
+        comment=(
+            "Range offset applied after removing the original offset "
+            "from the raw files."
+        ),
         dimensions=None,
     ),
+    "range": COMMON_ATTRIBUTES["range"]._replace(ancillary_variables="range_offset"),
     "antenna_diameter": MetaData(
         long_name="Antenna diameter", units="m", dimensions=("time",)
     ),

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

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

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

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