cloudnetpy 1.86.6__py3-none-any.whl → 1.86.8__py3-none-any.whl

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

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

{cloudnetpy-1.86.6.dist-info → cloudnetpy-1.86.8.dist-info}/METADATA

@@ -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.dist-info → cloudnetpy-1.86.8.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=qSr0YKQU7OntyaZjNNTnIr96Qa0HIqUVMRXrNYqNDlM,72
+cloudnetpy/version.py,sha256=tDEAGM4ZOh7PQr-aJssILIBJma1P3GJpN5G5IZwwRF0,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,10 +39,10 @@ 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=qzmuq5NBRmqYMjd_q-TjYAImtoPQOeQ2LDygu9BFQys,7322
+cloudnetpy/instruments/copernicus.py,sha256=Zf24DpqpjXvj-F9G7xHfxpJxf9SoH8roABtRtm7CyUM,7912
 cloudnetpy/instruments/da10.py,sha256=FcXEu6dfAVvYzMvauiJBSyEkYhGa8hBuwrrdo-3LwHE,1960
 cloudnetpy/instruments/fd12p.py,sha256=M5yJDsPi0tHWMDUYOsoqciyKdRQ-zHEq2t19KnpZ6Io,6915
-cloudnetpy/instruments/galileo.py,sha256=pJ5WaB-Nwzs5zgj8c2oaH7HieYxq4HF0aUilYTSRhYE,5682
+cloudnetpy/instruments/galileo.py,sha256=R5yGO5peqrKdzId500gzZpFR5Khw_1rLO1v7mYZ89Qk,5871
 cloudnetpy/instruments/hatpro.py,sha256=TGOqwW0TfoPEYk13MFvFzwgJGzm6MVE5AsPavcIoj3I,10248
 cloudnetpy/instruments/instruments.py,sha256=WZgH7HjzM9Ane1CSnYCSLidbST8hunUeSt2lPntq9As,4999
 cloudnetpy/instruments/lufft.py,sha256=G6KeJOeltLUlGCHHEk8ns2K7WJ9ImAr25rSB2JltawE,4286
@@ -56,7 +56,7 @@ cloudnetpy/instruments/rain_e_h3.py,sha256=fjv3SgeUNx9GisYqLrBnX9AjnO17VtouyoPh1
 cloudnetpy/instruments/rpg.py,sha256=LmvViLSevzjR2HmkP6MCHHDzafpTWoCvw7GaaEC37s0,21029
 cloudnetpy/instruments/rpg_reader.py,sha256=EcsUUyKNiZ-kEEz48zibs-uXH7CMNpedqlrfWOY4Dks,11899
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
-cloudnetpy/instruments/vaisala.py,sha256=tu7aljkMKep0uCWz-Sd-GuBXF_Yy421a4nHy0ffpMoc,4725
+cloudnetpy/instruments/vaisala.py,sha256=9YXEYDB75TerslOsSYqYLPybTE1GW6SQrFs3h_A6jbk,4830
 cloudnetpy/instruments/weather_station.py,sha256=mgjTBaJtevW_c3sv_-9jyFo5HXF-eeegXzbHBttxRyg,28845
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=WCPRCfAlElUzZpllOSjjWrLG2jgkiRIy0rWz_omFoJQ,10815
@@ -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.6.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.86.8.dist-info/licenses/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.86.6.dist-info/METADATA,sha256=nLTE2OtYDb-uMnJ9qTA-FgeiE_NtaIijw5MsCV1UePg,5836
-cloudnetpy-1.86.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudnetpy-1.86.6.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.86.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.86.6.dist-info/RECORD,,
+cloudnetpy-1.86.8.dist-info/METADATA,sha256=6YTHGtNzkkT_UtCfiWsLtjHHIGcCNAi5vE4Ey76gK1E,5836
+cloudnetpy-1.86.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudnetpy-1.86.8.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.86.8.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.86.8.dist-info/RECORD,,