cloudnetpy 1.66.8__py3-none-any.whl → 1.66.10__py3-none-any.whl

cloudnetpy/instruments/cloudnet_instrument.py

@@ -78,11 +78,16 @@ class CloudnetInstrument:
         self.screen_time_indices(ind)
 
     def screen_time_indices(self, valid_indices: list | np.ndarray) -> None:
-        if len(valid_indices) == 0:
-            msg = "All timestamps screened"
-            raise ValidTimeStampError(msg)
         time = self._get_time()
         n_time = len(time)
+        if len(valid_indices) == 0 or (
+            isinstance(valid_indices, np.ndarray)
+            and valid_indices.dtype == np.bool_
+            and valid_indices.shape == time.shape
+            and not np.any(valid_indices)
+        ):
+            msg = "All timestamps screened"
+            raise ValidTimeStampError(msg)
         for cloudnet_array in self.data.values():
             array = cloudnet_array.data
             if not utils.isscalar(array) and array.shape[0] == n_time:

cloudnetpy/instruments/weather_station.py

@@ -1,6 +1,7 @@
 import csv
 import datetime
 import math
+from collections.abc import Iterable
 
 import numpy as np
 from numpy import ma
@@ -109,14 +110,12 @@ class WS(CloudnetInstrument):
         self.data["rainfall_amount"] = CloudnetArray(rainfall_amount, "rainfall_amount")
 
     def screen_timestamps(self, date: str) -> None:
-        dates = [str(d.date()) for d in self._data["time"]]
-        valid_ind = [ind for ind, d in enumerate(dates) if d == date]
-        if not valid_ind:
+        dates = np.array([str(d.date()) for d in self._data["time"]])
+        valid_mask = dates == date
+        if not valid_mask.any():
             raise ValidTimeStampError
         for key in self._data:
-            self._data[key] = [
-                x for ind, x in enumerate(self._data[key]) if ind in valid_ind
-            ]
+            self._data[key] = self._data[key][valid_mask]
 
     @staticmethod
     def format_data(data: dict) -> dict:
@@ -436,15 +435,33 @@ class GalatiWS(WS):
                         except ValueError:
                             parsed_value = math.nan
                     raw_data[key].append(parsed_value)
+
+        def read_value(keys: Iterable[str]):
+            for key in keys:
+                if key in raw_data:
+                    return raw_data[key]
+            raise KeyError("Didn't find any keys: " + ", ".join(keys))
+
         data = {
-            "time": raw_data["TimeStamp"],
-            "air_temperature": raw_data["Temperature"],
-            "relative_humidity": raw_data["RH"],
-            "air_pressure": raw_data["Atmospheric_pressure"],
-            "rainfall_rate": raw_data["Precipitations"],
+            "time": read_value(["TimeStamp"]),
+            "air_temperature": read_value(["Temperature", "Temperatura"]),
+            "relative_humidity": read_value(["RH", "Umiditate_relativa"]),
+            "air_pressure": read_value(
+                ["Atmospheric_pressure", "Presiune_atmosferica"]
+            ),
+            "rainfall_rate": read_value(["Precipitations", "Precipitatii"]),
+            "wind_speed": read_value(["Wind_speed", "Viteza_vant"]),
+            "wind_direction": read_value(["Wind_direction", "Directie_vant"]),
         }
         return self.format_data(data)
 
+    def add_data(self) -> None:
+        # Skip wind measurements where range was limited to 0-180 degrees
+        if datetime.date(*map(int, self.date)) < datetime.date(2024, 10, 29):
+            del self._data["wind_speed"]
+            del self._data["wind_direction"]
+        return super().add_data()
+
     def convert_pressure(self) -> None:
         mmHg2Pa = 133.322
         self.data["air_pressure"].data = self.data["air_pressure"][:] * mmHg2Pa

cloudnetpy/version.py

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

{cloudnetpy-1.66.8.dist-info → cloudnetpy-1.66.10.dist-info}/METADATA

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

{cloudnetpy-1.66.8.dist-info → cloudnetpy-1.66.10.dist-info}/RECORD

@@ -9,7 +9,7 @@ cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YrWRBEZg0QNZRVnd9ziAziH-eJSh7O5JuWiH4ZxM0_s,15584
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=JksYOwf9ORiR_QpoKrTe1JJwXpPYJj-wlwaZKCHoh3o,29744
-cloudnetpy/version.py,sha256=_HpTDfNRU86QUkp683KtI0kEE_sns9m5_9nnN3CEWVM,72
+cloudnetpy/version.py,sha256=y6mBVI00nak74QkrnJRk-arOU8OyMHhHQYJxEn3nh00,73
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -38,7 +38,7 @@ cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3
 cloudnetpy/instruments/ceilo.py,sha256=xrI7iYNftKvGZf-3C_ESUNsu-QhXV43iWkDuKp3biZU,9552
 cloudnetpy/instruments/ceilometer.py,sha256=pdmLVljsuciyKpaGxWxJ_f1IrJK-UrkBC0lSeuirLlU,12095
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
-cloudnetpy/instruments/cloudnet_instrument.py,sha256=r4xurc6jegbHBmIe_JEpvPmV4Ga0GhPiv1ff4MjcNZs,3680
+cloudnetpy/instruments/cloudnet_instrument.py,sha256=6qQSyQXHBTdOvzqTxOXtx6RYDm7vLVcwNYTx1nV_kM8,3885
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
 cloudnetpy/instruments/galileo.py,sha256=yQBedd7dmDnwuWi1MtXOsg4-RyRx0uRAXumCY4YuH9k,4686
 cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
@@ -54,7 +54,7 @@ cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4
 cloudnetpy/instruments/rpg_reader.py,sha256=ThztFuVrWxhmWVAfZTfQDeUiKK1XMTbtv08IBe8GK98,11364
 cloudnetpy/instruments/toa5.py,sha256=CfmmBMv5iMGaWHIGBK01Rw24cuXC1R1RMNTXkmsm340,1760
 cloudnetpy/instruments/vaisala.py,sha256=GGuA_v4S7kR9yApSr1-d0ETzNj4ehEZ7-pD1-AdPYRE,14662
-cloudnetpy/instruments/weather_station.py,sha256=IJw3qdyXkJf10LOfxcpFqGNRN5ThgYfR8l764FVc9l4,17503
+cloudnetpy/instruments/weather_station.py,sha256=p0JoKuh0Rce9WcQNtvwaxehieBoGWnE1cKotx_ClXPs,18259
 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
@@ -115,9 +115,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.8.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.8.dist-info/METADATA,sha256=HptVJMJeTubhD5gtb1l1ZCmrDsvgOLI_dSWdt-HIujo,5784
-cloudnetpy-1.66.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-cloudnetpy-1.66.8.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.66.8.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.8.dist-info/RECORD,,
+cloudnetpy-1.66.10.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.10.dist-info/METADATA,sha256=Vx3pgajb43-nUPGuinTNL5-7O1XPhC1rHttQTGm7Bv0,5785
+cloudnetpy-1.66.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+cloudnetpy-1.66.10.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.66.10.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.10.dist-info/RECORD,,