cloudnetpy 1.69.8__tar.gz → 1.69.10__tar.gz

{cloudnetpy-1.69.8/cloudnetpy.egg-info → cloudnetpy-1.69.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.8
+Version: 1.69.10
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10}/cloudnetpy/exceptions.py

@@ -30,13 +30,6 @@ class PlottingError(CloudnetException):
         super().__init__(msg)
 
 
-class WeatherStationDataError(CloudnetException):
-    """Internal exception class."""
-
-    def __init__(self, msg: str = "Unable to read the file"):
-        super().__init__(msg)
-
-
 class ModelDataError(CloudnetException):
     """Internal exception class."""
 

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10}/cloudnetpy/instruments/disdrometer/thies.py

@@ -4,6 +4,7 @@ from os import PathLike
 from typing import Any
 
 import numpy as np
+from numpy import ma
 
 from cloudnetpy import output
 from cloudnetpy.cloudnetarray import CloudnetArray
@@ -107,6 +108,7 @@ def thies2nc(
         raise DisdrometerDataError(msg) from err
     disdrometer.sort_timestamps()
     disdrometer.remove_duplicate_timestamps()
+    disdrometer.mask_invalid_values()
     disdrometer.add_meta()
     disdrometer.convert_units()
     attributes = output.add_time_attribute(ATTRIBUTES, disdrometer.date)
@@ -269,6 +271,12 @@ class Thies(Disdrometer):
         for key in self.raw_data:
             self.raw_data[key] = self.raw_data[key][valid_mask]
 
+    def mask_invalid_values(self) -> None:
+        rainfall_rate = self.data["rainfall_rate"]
+        rainfall_rate.data = ma.masked_where(
+            rainfall_rate.data > 999, rainfall_rate.data
+        )
+
     def _create_velocity_vectors(self) -> None:
         n_values = [5, 6, 7, 1, 1]
         spreads = [0.2, 0.4, 0.8, 1, 10]

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10}/cloudnetpy/instruments/rain_e_h3.py

@@ -31,7 +31,6 @@ def rain_e_h32nc(
         UUID of the generated file.
 
     Raises:
-        WeatherStationDataError : Unable to read the file.
         ValidTimeStampError: No valid timestamps found.
     """
     rain = RainEH3(site_meta)

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10}/cloudnetpy/instruments/weather_station.py

@@ -10,7 +10,7 @@ from cloudnetpy import output
 from cloudnetpy.categorize import atmos_utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.constants import HPA_TO_PA, MM_H_TO_M_S, SEC_IN_HOUR
-from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
+from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CSVFile
 from cloudnetpy.instruments.toa5 import read_toa5
@@ -38,48 +38,44 @@ def ws2nc(
         UUID of the generated file.
 
     Raises:
-        WeatherStationDataError : Unable to read the file.
         ValidTimeStampError: No valid timestamps found.
     """
     if not isinstance(weather_station_file, list):
         weather_station_file = [weather_station_file]
-    try:
-        ws: WS
-        if site_meta["name"] == "Palaiseau":
-            ws = PalaiseauWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Bucharest":
-            ws = BucharestWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Granada":
-            ws = GranadaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Kenttärova":
-            ws = KenttarovaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Hyytiälä":
-            ws = HyytialaWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Galați":
-            ws = GalatiWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Jülich":
-            ws = JuelichWS(weather_station_file, site_meta)
-        elif site_meta["name"] == "Lampedusa":
-            ws = LampedusaWS(weather_station_file, site_meta)
-        else:
-            msg = "Unsupported site"
-            raise ValueError(msg)  # noqa: TRY301
-        if date is not None:
-            ws.screen_timestamps(date)
-        ws.convert_time()
-        ws.add_date()
-        ws.add_site_geolocation()
-        ws.add_data()
-        ws.convert_temperature_and_humidity()
-        ws.convert_pressure()
-        ws.convert_rainfall_rate()
-        ws.convert_rainfall_amount()
-        ws.normalize_rainfall_amount()
-        ws.calculate_rainfall_amount()
-        attributes = output.add_time_attribute({}, ws.date)
-        output.update_attributes(ws.data, attributes)
-    except ValueError as err:
-        raise WeatherStationDataError from err
+    ws: WS
+    if site_meta["name"] == "Palaiseau":
+        ws = PalaiseauWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Bucharest":
+        ws = BucharestWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Granada":
+        ws = GranadaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Kenttärova":
+        ws = KenttarovaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Hyytiälä":
+        ws = HyytialaWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Galați":
+        ws = GalatiWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Jülich":
+        ws = JuelichWS(weather_station_file, site_meta)
+    elif site_meta["name"] == "Lampedusa":
+        ws = LampedusaWS(weather_station_file, site_meta)
+    else:
+        msg = "Unsupported site"
+        raise ValueError(msg)
+    if date is not None:
+        ws.screen_timestamps(date)
+    ws.convert_time()
+    ws.add_date()
+    ws.add_site_geolocation()
+    ws.add_data()
+    ws.convert_temperature_and_humidity()
+    ws.convert_pressure()
+    ws.convert_rainfall_rate()
+    ws.convert_rainfall_amount()
+    ws.normalize_rainfall_amount()
+    ws.calculate_rainfall_amount()
+    attributes = output.add_time_attribute({}, ws.date)
+    output.update_attributes(ws.data, attributes)
     return output.save_level1b(ws, output_file, uuid)
 
 
@@ -520,14 +516,15 @@ class LampedusaWS(WS):
             raw_data: dict = {key: [] for key in fields}
             for row in reader:
                 for key, value in row.items():
+                    fixed_value = value.strip("\0")
                     parsed_value: float | datetime.datetime
                     if key == "time":
                         parsed_value = datetime.datetime.strptime(
-                            value, "%y%m%d %H%M%S"
+                            fixed_value, "%y%m%d %H%M%S"
                         )
                     else:
                         try:
-                            parsed_value = float(value)
+                            parsed_value = float(fixed_value)
                         except ValueError:
                             parsed_value = math.nan
                     raw_data[key].append(parsed_value)

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10}/cloudnetpy/version.py

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

{cloudnetpy-1.69.8 → cloudnetpy-1.69.10/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudnetpy
-Version: 1.69.8
+Version: 1.69.10
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License