cloudnetpy 1.69.8__py3-none-any.whl → 1.69.10__py3-none-any.whl

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

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

{cloudnetpy-1.69.8.dist-info → cloudnetpy-1.69.10.dist-info}/METADATA

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

@@ -4,12 +4,12 @@ cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7
 cloudnetpy/concat_lib.py,sha256=jcLppqAmVHVkykcXBcpwUr8MS_k8v2Xl2xBLmVRE_DI,12624
 cloudnetpy/constants.py,sha256=jjW1eO5BwmLjtCKXKGXtKF_BoKpvSNrRfpgW43fWT_0,824
 cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
-cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
+cloudnetpy/exceptions.py,sha256=hYbUtBwjCIfxnPe_5mELDEw87AWITBrwuo7WYIEKmJ8,1579
 cloudnetpy/metadata.py,sha256=BDEpgwZ58PHznc1gi11gtNNV4kFiMAmlHnF4huTy7nw,5982
 cloudnetpy/output.py,sha256=lq4YSeMT_d-j4rlQkKm9KIZ8boupTBBBKV1eUawpmCI,15672
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=U0iMIKPiKLrLVAfs_u9pPuoWYW1RJHcM8dbLF9a4yIA,29796
-cloudnetpy/version.py,sha256=oaJd6xYmjdmgsgXNLrMDy5RnVEklJFG2LJx1HtW5UnE,72
+cloudnetpy/version.py,sha256=ShflVzzkFEWEAw_-lUTsVpopYYHwblHCZzQCIFcUW50,73
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=RcmbKxm2COkE7WEya0mK3yX5rzUbrewRVh3ekm01RtM,10598
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -50,16 +50,16 @@ cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wf
 cloudnetpy/instruments/nc_radar.py,sha256=QAkiLo3Z-OY6udOxS9O3xWseR_pkd7B82J0JUvPBO4E,7335
 cloudnetpy/instruments/pollyxt.py,sha256=ra7sYQ_cmkC0T9TBYrMN6iiQEZimmWGdW9Ilv61JB-Q,10027
 cloudnetpy/instruments/radiometrics.py,sha256=ySG4a042XkgjMTG8d20oAPNvFvw9bMwwiqS3zv-JF_w,11825
-cloudnetpy/instruments/rain_e_h3.py,sha256=IY-ytMjQUV94qMQgIXMJsPXe6oF3yk-d9LIbN19ogv0,5376
+cloudnetpy/instruments/rain_e_h3.py,sha256=9TdpP4UzMBNIt2iE2GL6K9dFldzTHPLOrU8Q3tcosCU,5317
 cloudnetpy/instruments/rpg.py,sha256=vfs_eGahPOxFjOIBczNywRwtdutOsJpSNeXZm99SIOo,17438
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=MA6hAlanFrxJlF4suDxLt5FyjcSSzJg-SWRnkLQpu3E,14688
-cloudnetpy/instruments/weather_station.py,sha256=3xClMqo4SV361flX7YM9psEKgF9gr8RHiAN0DKfJ0Kg,20623
+cloudnetpy/instruments/weather_station.py,sha256=pg5Rf6A0qkbAYV1NvC1-oQLkwe9-gmLxHJ8CYW7xgYI,20365
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=HJZrEysQkx9MiIVPDV25CYHpXi_SjgZlgO-otoaKK34,25640
-cloudnetpy/instruments/disdrometer/thies.py,sha256=xePvkLdQbptPDe8yZHCHoYblVg4FDbhtH7AE32lEkcE,10676
+cloudnetpy/instruments/disdrometer/thies.py,sha256=4T15XW5Hu0SviL_a_PWieIWkZzaVJY92Qm7psSa1kPU,10943
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=jnpTxwxLSZdt08By0cjFDmq1KWC4fhJaN_MfjgA8ijQ,6440
 cloudnetpy/model_evaluation/metadata.py,sha256=PAsnOqcUoV3CJwplgWiVCF9Zt4io8tqj7CIgS4fEL-8,8412
@@ -116,9 +116,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=uu4l6reuGbPcW3TgttbaSrqIKbyYGhBVTdnC7opKvmg,11101
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.69.8.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.69.8.dist-info/METADATA,sha256=jNccVHKF97dDMCivFHqVVmoHQ0MQ2yU9ZnR6kz-Tfts,5844
-cloudnetpy-1.69.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-cloudnetpy-1.69.8.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.69.8.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.69.8.dist-info/RECORD,,
+cloudnetpy-1.69.10.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.69.10.dist-info/METADATA,sha256=YyapSHk3ZusG0R2vSX6ReLXM5kE57ivobvAdX9c6Ykc,5845
+cloudnetpy-1.69.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+cloudnetpy-1.69.10.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.69.10.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.69.10.dist-info/RECORD,,