cloudnetpy 1.61.0__py3-none-any.whl → 1.61.2__py3-none-any.whl

cloudnetpy/instruments/disdrometer/common.py

@@ -1,5 +1,7 @@
 """Module for reading / converting disdrometer data."""
 
+from typing import Literal
+
 import numpy as np
 
 from cloudnetpy.cloudnetarray import CloudnetArray
@@ -15,15 +17,24 @@ class Disdrometer(CloudnetInstrument):
             if name in valid_keys:
                 self.data[name] = CloudnetArray(float(value), name)
 
-    def _convert_data(self, keys: tuple, value: float, method: str = "divide") -> None:
+    def _convert_data(
+        self,
+        keys: tuple[str, ...],
+        value: float,
+        method: Literal["divide", "add"] = "divide",
+    ) -> None:
         for key in keys:
-            if key in self.data:
-                if method == "divide":
-                    self.data[key].data = self.data[key].data / value
-                elif method == "add":
-                    self.data[key].data = self.data[key].data + value
-                else:
-                    raise ValueError
+            if key not in self.data:
+                continue
+            variable = self.data[key]
+            if method == "divide":
+                variable.data = variable.data.astype("f4") / value
+                variable.data_type = "f4"
+            elif method == "add":
+                variable.data = variable.data.astype("f4") + value
+                variable.data_type = "f4"
+            else:
+                raise ValueError
 
     def store_vectors(
         self,

cloudnetpy/instruments/disdrometer/thies.py

@@ -1,5 +1,4 @@
 import datetime
-from collections import defaultdict
 from os import PathLike
 from typing import Any
 
@@ -8,7 +7,7 @@ import numpy as np
 from cloudnetpy import output
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.constants import MM_TO_M, SEC_IN_HOUR
-from cloudnetpy.exceptions import DisdrometerDataError
+from cloudnetpy.exceptions import DisdrometerDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.toa5 import read_toa5
 
@@ -126,7 +125,7 @@ class Thies(Disdrometer):
         self.n_velocity = 20
         self.n_diameter = 22
         self.site_meta = site_meta
-        self.raw_data: dict[str, Any] = defaultdict(list)
+        self.raw_data: dict[str, Any] = {}
         self._read_data(filename)
         self._screen_time(expected_date)
         self.data = {}
@@ -157,6 +156,8 @@ class Thies(Disdrometer):
             with open(filename) as file:
                 for line in file:
                     self._read_line(line)
+        if "time" not in self.raw_data or len(self.raw_data["time"]) == 0:
+            raise ValidTimeStampError
         for key, value in self.raw_data.items():
             array = np.array(value)
             if key == "time":
@@ -224,6 +225,8 @@ class Thies(Disdrometer):
                 value = raw_values[i]
             else:
                 value = int(raw_values[i])
+            if key not in self.raw_data:
+                self.raw_data[key] = []
             self.raw_data[key].append(value)
         self.raw_data["spectrum"].append(
             np.array(list(map(int, raw_values[79:-2])), dtype="i2").reshape(

cloudnetpy/version.py

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

{cloudnetpy-1.61.0.dist-info → cloudnetpy-1.61.2.dist-info}/METADATA

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

{cloudnetpy-1.61.0.dist-info → cloudnetpy-1.61.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=yXaNRiv7_J3_1S8AdHMUGGwtfSHvLCTJ991S3zY0sbw,72
+cloudnetpy/version.py,sha256=sAvITtDW5JS3Asr69JBOzLFDkpZJrWxwM186iAa0fuc,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
@@ -49,9 +49,9 @@ cloudnetpy/instruments/toa5.py,sha256=xYJYEVNykCWqIsESno0eBIWqkYb-LHXjFjUp3EoqGD
 cloudnetpy/instruments/vaisala.py,sha256=GzESZvboOoXzWmmr9dC-y6oM6ogc-M-zT3KmBTaD0LI,14512
 cloudnetpy/instruments/weather_station.py,sha256=gTY3Y5UATqJo9Gld4hm7WdsKBwcF8WgNTIK2nOfl3Nc,5739
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
-cloudnetpy/instruments/disdrometer/common.py,sha256=A9k4z4SwZaqORUca3fYVCG0aS1Emy84B2755kShGeY8,9040
+cloudnetpy/instruments/disdrometer/common.py,sha256=g52iK2aNp3Z88kovUmGVpC54NZomPa9D871gzO0AmQ4,9267
 cloudnetpy/instruments/disdrometer/parsivel.py,sha256=WiL-vCjw9Gmb5irvW3AXddsyprp8MGOfqcVAlfy0zpc,25521
-cloudnetpy/instruments/disdrometer/thies.py,sha256=dNSpRlyZPjQDVA6cm-Xkh-ub1fwLxok-9-xZBxcYIJA,9645
+cloudnetpy/instruments/disdrometer/thies.py,sha256=IkaWQKg0P3eMd8lFPGfXRMF4nTIueYXPHZP9m37abuU,9809
 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.0.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.61.0.dist-info/METADATA,sha256=ZxuqGJhzfPtzacU04IO88UaXFvUlchwavhzhduLpPtA,5784
-cloudnetpy-1.61.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloudnetpy-1.61.0.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.61.0.dist-info/RECORD,,
+cloudnetpy-1.61.2.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.61.2.dist-info/METADATA,sha256=u7OyOYzUq-Jo-O1mMv2w_V8swmT-xX21o96TrNQeA1g,5784
+cloudnetpy-1.61.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloudnetpy-1.61.2.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.61.2.dist-info/RECORD,,