cloudnetpy 1.61.3__py3-none-any.whl → 1.61.5__py3-none-any.whl

cloudnetpy/categorize/categorize.py

@@ -1,4 +1,6 @@
 """Module that generates Cloudnet categorize file."""
+import logging
+
 from cloudnetpy import output, utils
 from cloudnetpy.categorize import atmos, classify
 from cloudnetpy.categorize.disdrometer import Disdrometer
@@ -7,7 +9,7 @@ from cloudnetpy.categorize.model import Model
 from cloudnetpy.categorize.mwr import Mwr
 from cloudnetpy.categorize.radar import Radar
 from cloudnetpy.datasource import DataSource
-from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.exceptions import DisdrometerDataError, ValidTimeStampError
 from cloudnetpy.metadata import MetaData
 
 
@@ -61,7 +63,7 @@ def generate_categorize(
     def _interpolate_to_cloudnet_grid() -> list:
         wl_band = utils.get_wl_band(data["radar"].radar_frequency)
         data["mwr"].rebin_to_grid(time)
-        if is_disdrometer:
+        if data["disdrometer"] is not None:
             data["disdrometer"].interpolate_to_grid(time)
         data["model"].interpolate_to_common_height(wl_band)
         model_gap_ind = data["model"].interpolate_to_grid(time, height)
@@ -94,7 +96,7 @@ def generate_categorize(
     def _prepare_output() -> dict:
         data["radar"].add_meta()
         data["model"].screen_sparse_fields()
-        if is_disdrometer:
+        if data["disdrometer"] is not None:
             data["radar"].data.pop("rainfall_rate", None)
             data["disdrometer"].data.pop("n_particles", None)
         for key in ("category_bits", "insect_prob"):
@@ -111,7 +113,7 @@ def generate_categorize(
             **data["model"].data,
             **data["model"].data_sparse,
             **data["mwr"].data,
-            **(data["disdrometer"].data if is_disdrometer else {}),
+            **(data["disdrometer"].data if data["disdrometer"] is not None else {}),
         }
 
     def _define_dense_grid() -> tuple:
@@ -123,17 +125,18 @@ def generate_categorize(
                 obj.close()
 
     try:
-        is_disdrometer = "disdrometer" in input_files
-
         data: dict = {
             "radar": Radar(input_files["radar"]),
             "lidar": Lidar(input_files["lidar"]),
             "mwr": Mwr(input_files["mwr"]),
             "lv0_files": input_files.get("lv0_files"),
-            "disdrometer": Disdrometer(input_files["disdrometer"])
-            if is_disdrometer
-            else None,
+            "disdrometer": None,
         }
+        if "disdrometer" in input_files:
+            try:
+                data["disdrometer"] = Disdrometer(input_files["disdrometer"])
+            except DisdrometerDataError as err:
+                logging.warning("Unable to use disdrometer: %s", err)
         data["model"] = Model(input_files["model"], data["radar"].altitude)
         time, height = _define_dense_grid()
         valid_ind = _interpolate_to_cloudnet_grid()

cloudnetpy/categorize/disdrometer.py

@@ -7,6 +7,7 @@ from scipy.interpolate import interp1d
 
 from cloudnetpy.categorize.lidar import get_gap_ind
 from cloudnetpy.datasource import DataSource
+from cloudnetpy.exceptions import DisdrometerDataError
 
 
 class Disdrometer(DataSource):
@@ -29,6 +30,9 @@ class Disdrometer(DataSource):
     def _init_rainfall_rate(self) -> None:
         keys = ("rainfall_rate", "n_particles")
         for key in keys:
+            if key not in self.dataset.variables:
+                msg = f"variable {key} is missing"
+                raise DisdrometerDataError(msg)
             self.append_data(self.dataset.variables[key][:], key)
 
     def _interpolate(self, y: ma.MaskedArray, x_new: np.ndarray) -> np.ndarray:

cloudnetpy/instruments/disdrometer/thies.py

@@ -194,9 +194,13 @@ class Thies(Disdrometer):
 
     def _read_line(self, line: str, timestamp: datetime.datetime | None = None):
         raw_values = line.split(";")
-        if len(raw_values) != 521:
+        # Support custom truncated format used in Leipzig LIM.
+        expected_columns = self.site_meta.get("truncate_columns", 521)
+        if len(raw_values) != expected_columns:
             return
         for i, key in TELEGRAM4:
+            if i >= expected_columns - 1:
+                break
             value: Any
             if key == "_date":
                 value = _parse_date(raw_values[i])
@@ -227,11 +231,12 @@ class Thies(Disdrometer):
             else:
                 value = int(raw_values[i])
             self.raw_data[key].append(value)
-        self.raw_data["spectrum"].append(
-            np.array(list(map(int, raw_values[79:-2])), dtype="i2").reshape(
-                self.n_diameter, self.n_velocity
+        if expected_columns > 79:
+            self.raw_data["spectrum"].append(
+                np.array(list(map(int, raw_values[79:-2])), dtype="i2").reshape(
+                    self.n_diameter, self.n_velocity
+                )
             )
-        )
         if timestamp is not None:
             self.raw_data["time"].append(timestamp)
         else:
@@ -266,7 +271,9 @@ class Thies(Disdrometer):
 
 def _parse_date(date: str) -> datetime.date:
     day, month, year = map(int, date.split("."))
-    return datetime.date(2000 + year, month, day)
+    if year < 100:
+        year += 2000
+    return datetime.date(year, month, day)
 
 
 def _parse_time(time: str) -> datetime.time:

cloudnetpy/version.py

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

{cloudnetpy-1.61.3.dist-info → cloudnetpy-1.61.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.61.3
+Version: 1.61.5
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.61.3.dist-info → cloudnetpy-1.61.5.dist-info}/RECORD

@@ -8,14 +8,14 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=WoVTNuxni0DUr163vZ-_mDr1brXhY15XSlGMrq9Aoqw,14700
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=0TlHm71YtSrKXBsRKctitnhQrvZPE-ulEVeAQW-oK58,27398
-cloudnetpy/version.py,sha256=j5-CDdAsDSNeVW2c3qchPfFYzU-EbVus4d_rAbQtybY,72
+cloudnetpy/version.py,sha256=wWSbFMdT54VpsZJNxnh15y-5LNveGZg6cV6si07cF60,72
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=fWW8ye_8HZASRAiYwURFKWzcGOYIA2RKeVxCq0lVOuM,12389
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
-cloudnetpy/categorize/categorize.py,sha256=QNSqEtpe1qtFQAKOG1suffPaYEwtOf4KMij9PdW9-Us,17477
+cloudnetpy/categorize/categorize.py,sha256=p3LLBXSu5AOMrJWwAZeS6J-Xzh4PkXuPmOCZiEHzt2w,17678
 cloudnetpy/categorize/classify.py,sha256=x7aqPfhw4xuER22sqOb9ES9nijwk1E8b7HF7uaFJD7k,9218
 cloudnetpy/categorize/containers.py,sha256=j6oSKPeZcq9vFthYaocAw1m6yReRNNPYUQF5UTDq4YM,4232
-cloudnetpy/categorize/disdrometer.py,sha256=0Z0nvUtoZKDxiUfBZzoYZxUFOVjq-thmYfaCkskeECs,1799
+cloudnetpy/categorize/disdrometer.py,sha256=daPB1JgERRqa0Ekxx_LYCP8mDe3XnUYj2VlsIKAB7sE,2003
 cloudnetpy/categorize/droplet.py,sha256=pUmB-gN0t9sVgsGLof6X9N0nuEb4EBtEUswwpoQapTY,8687
 cloudnetpy/categorize/falling.py,sha256=xES5ZdYs34tbX1p4a9kzt9r3G5s25Mpvs5WeFs1KNzo,4385
 cloudnetpy/categorize/freezing.py,sha256=684q83TPQ5hHrbbHX-E36VoTlWLSOlGfOW1FC8b3wfI,3754
@@ -51,7 +51,7 @@ cloudnetpy/instruments/weather_station.py,sha256=gTY3Y5UATqJo9Gld4hm7WdsKBwcF8Wg
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=WiL-vCjw9Gmb5irvW3AXddsyprp8MGOfqcVAlfy0zpc,25521
-cloudnetpy/instruments/disdrometer/thies.py,sha256=t0RtiDbWkco8I_oJcvlqOEbK3hVdppiD6DzYNpCsqrA,9748
+cloudnetpy/instruments/disdrometer/thies.py,sha256=lNR5ahOKIsO_gcpmbYZwh2UP2aawpQ5J9RrrnPKFFIE,10046
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=oUGIblcEWLLv16YKUch-M5KA-dGRAcuHa-9anP3xtX4,6447
 cloudnetpy/model_evaluation/metadata.py,sha256=7ZL87iDbaQJIMu8wfnMvb01cGVPkl8RtvEm_tt9uIHE,8413
@@ -108,8 +108,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=rhx_Ru9FLlQqCNM-awoiHx18-Aq1eBwL9LiUaQoJs6k,10412
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.61.3.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.61.3.dist-info/METADATA,sha256=dJ8xwncxh3pF3sT4uOHj8dnwHQ0XtJ29kSa2cUZbM2g,5784
-cloudnetpy-1.61.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloudnetpy-1.61.3.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.61.3.dist-info/RECORD,,
+cloudnetpy-1.61.5.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.61.5.dist-info/METADATA,sha256=yj6xgn1999ZwuQIreZDzaDsYYfX9lnjDmA0oTL93Y4M,5784
+cloudnetpy-1.61.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloudnetpy-1.61.5.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.61.5.dist-info/RECORD,,