cloudnetpy 1.86.5__py3-none-any.whl → 1.86.7__py3-none-any.whl

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/version.py

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

{cloudnetpy-1.86.5.dist-info → cloudnetpy-1.86.7.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.86.7.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=qqLXSUVhIi6H_Z1zlfXeEkc9qBqA1XO-UwsCVxjIcfk,7317
 cloudnetpy/output.py,sha256=NpuxmtLk2JLTdubCupdL4rFbx30YqgeU6vwAe_v8thc,15133
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=9MMYok1A7oJS2XBkIFhaiDWt_MYLo8tLzF3_880masM,34321
-cloudnetpy/version.py,sha256=Va6HjzCd42qubMOwHV5hz8UCWeFMp6EzRf_6g1bNCNA,72
+cloudnetpy/version.py,sha256=r7f__YQN7rorCA82YzOllNIZZqBrlFL-RSNTn3sG54U,72
 cloudnetpy/categorize/__init__.py,sha256=gtvzWr0IDRn2oA6yHBvinEhTGTuub-JkrOv93lBsgrE,61
 cloudnetpy/categorize/atmos_utils.py,sha256=uWc9TABVYPI0sn4H5Az9Jf6NVRaWyEKIi17f0pAJQxE,10679
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -39,7 +39,7 @@ cloudnetpy/instruments/ceilo.py,sha256=scb3n0gLOZ1gPs_WdWw9KS5Ut_mtCvSdWFMKKCvXh
 cloudnetpy/instruments/ceilometer.py,sha256=c37uteeuGnlE-o-Smu49H2qQJw6qZ0tc3Bzhyr1FoSo,13063
 cloudnetpy/instruments/cl61d.py,sha256=JsCHqVzFGhZi-5xcnsB507FDpyuw83uSWK3IFO3DhdI,2238
 cloudnetpy/instruments/cloudnet_instrument.py,sha256=B1UkiB0ytnT3MWYalEegql5QIPaMLg5bJy5xI50JEco,4503
-cloudnetpy/instruments/copernicus.py,sha256=AuGvPjn6hofzSKlh2M7knb5zBgzY3xfDvu3WF6KGlp8,7091
+cloudnetpy/instruments/copernicus.py,sha256=ePTP9R_1_khGb7CcTNkzhhZnvzHJS-bWHy5LEiNTwio,7723
 cloudnetpy/instruments/da10.py,sha256=FcXEu6dfAVvYzMvauiJBSyEkYhGa8hBuwrrdo-3LwHE,1960
 cloudnetpy/instruments/fd12p.py,sha256=M5yJDsPi0tHWMDUYOsoqciyKdRQ-zHEq2t19KnpZ6Io,6915
 cloudnetpy/instruments/galileo.py,sha256=pJ5WaB-Nwzs5zgj8c2oaH7HieYxq4HF0aUilYTSRhYE,5682
@@ -118,10 +118,10 @@ cloudnetpy/products/lwc.py,sha256=xsNiiG6dGKIkWaFk0xWTabc1bZ4ULf6SqcqHs7itAUk,19
 cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe55y9ob58,16637951
 cloudnetpy/products/mwr_tools.py,sha256=MMWnp68U7bv157-CPB2VeTQvaR6zl7sexbBT_kJ_pn8,6734
 cloudnetpy/products/product_tools.py,sha256=eyqIw_0KhlpmmYQE69RpGdRIAOW7JVPlEgkTBp2kdps,11302
-cloudnetpy-1.86.5.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.86.7.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.86.5.dist-info/METADATA,sha256=tF3Zehy97hcHHsGatoLodQPTYVWUrMkQdjGzdOmEyDU,5836
-cloudnetpy-1.86.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.86.5.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.86.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.86.5.dist-info/RECORD,,
+cloudnetpy-1.86.7.dist-info/METADATA,sha256=IXT83YpCQcBA6ruim2e6lfu4zVQjWzlQpLzW_rOvQtU,5836
+cloudnetpy-1.86.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.86.7.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.86.7.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.86.7.dist-info/RECORD,,