cloudnetpy 1.86.6__tar.gz → 1.86.8__tar.gz

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

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

{cloudnetpy-1.86.6 → cloudnetpy-1.86.8}/cloudnetpy/instruments/copernicus.py

@@ -10,6 +10,7 @@ from uuid import UUID
 import numpy as np
 
 from cloudnetpy import concat_lib, output, utils
+from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.instruments import COPERNICUS
 from cloudnetpy.instruments.nc_radar import ChilboltonRadar
 from cloudnetpy.metadata import COMMON_ATTRIBUTES, MetaData
@@ -77,6 +78,9 @@ def copernicus2nc(
                 valid_filenames = utils.get_files_with_variables(
                     valid_filenames, ["time", "ZED_HC"]
                 )
+                if not valid_filenames:
+                    msg = "No valid files."
+                    raise ValidTimeStampError(msg)
                 variables = list(keymap.keys())
                 concat_lib.concatenate_files(
                     valid_filenames,
@@ -131,16 +135,29 @@ class Copernicus(ChilboltonRadar):
         self.instrument = COPERNICUS
 
     def calibrate_reflectivity(self) -> None:
-        zed_hc = self.dataset.variables["ZED_HC"]
+        zed_hc = self.dataset["ZED_HC"]
         offset_applied = getattr(zed_hc, "applied_calibration_offset", 0)
 
-        # Estimated by comparing with MIRA-35 2021 data:
+        # 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[:] = 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.
 
@@ -153,12 +170,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]
@@ -187,9 +198,13 @@ ATTRIBUTES = {
     "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.6 → cloudnetpy-1.86.8}/cloudnetpy/instruments/galileo.py

@@ -9,6 +9,7 @@ from uuid import UUID
 import numpy as np
 
 from cloudnetpy import concat_lib, output, utils
+from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.instruments import GALILEO
 from cloudnetpy.instruments.nc_radar import ChilboltonRadar
 from cloudnetpy.metadata import MetaData
@@ -76,6 +77,9 @@ def galileo2nc(
                 valid_filenames = utils.get_files_with_variables(
                     valid_filenames, ["time", "ZED_HC"]
                 )
+                if not valid_filenames:
+                    msg = "No valid files."
+                    raise ValidTimeStampError(msg)
                 variables = list(keymap.keys())
                 concat_lib.concatenate_files(
                     valid_filenames,

{cloudnetpy-1.86.6 → cloudnetpy-1.86.8}/cloudnetpy/instruments/vaisala.py

@@ -34,6 +34,9 @@ class VaisalaCeilo(Ceilometer):
     def read_ceilometer_file(self, calibration_factor: float | None = None) -> None:
         """Read all lines of data from the file."""
         time, data = self.reader(self.full_path)
+        if not data:
+            msg = "No valid data found."
+            raise ValidTimeStampError(msg)
         range_res = data[0].range_resolution
         n_gates = len(data[0].beta)
         self.data["time"] = np.array(time)

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

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

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

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