doppy 0.2.2__cp310-abi3-win_amd64.whl → 0.2.4__cp310-abi3-win_amd64.whl

doppy/netcdf.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 from typing import Literal, TypeAlias
 
 import netCDF4
@@ -17,10 +18,14 @@ class Dataset:
         self.nc.createDimension(dim, None)
         return self
 
-    def add_atribute(self, key: str, val: str) -> Dataset:
+    def add_attribute(self, key: str, val: str) -> Dataset:
         setattr(self.nc, key, val)
         return self
 
+    def add_atribute(self, key: str, val: str) -> Dataset:
+        warnings.warn("Use add_attribute", DeprecationWarning)
+        return self.add_attribute(key, val)
+
     def add_time(
         self,
         name: str,

doppy/product/stare.py

@@ -142,7 +142,7 @@ def _compute_beta(
     c
         speed of light
     B
-        reveiver bandwidth
+        receiver bandwidth
 
     References
     ----------
@@ -560,7 +560,7 @@ def _select_raws_for_stare(
 
 
 def _selection_key(raw: doppy.raw.HaloHpl) -> SelectionGroupKeyType:
-    return (raw.header.mergable_hash(),)
+    return (raw.header.mergeable_hash(),)
 
 
 def _time2bg_time(

doppy/product/wind.py

@@ -406,7 +406,7 @@ def _selection_key(raw: doppy.raw.HaloHpl) -> SelectionGroupKeyType:
     if len(raw.elevation_angles) != 1:
         raise ValueError("Expected only one elevation angle")
     return (
-        raw.header.mergable_hash(),
+        raw.header.mergeable_hash(),
         next(iter(raw.elevation_angles)),
         tuple(sorted(raw.azimuth_angles)),
     )

doppy/raw/halo_hpl.py

@@ -207,7 +207,7 @@ class HaloHplHeader:
     system_id: str
     instrument_spectral_width: float | None
 
-    def mergable_hash(self) -> int:
+    def mergeable_hash(self) -> int:
         return hash(
             (
                 self.gate_points,

doppy/raw/halo_sys_params.py

@@ -81,7 +81,7 @@ def _from_src(data: BufferedIOBase) -> HaloSysParams:
     b = [r.split(b"\t") for r in a]
     arr = np.array(b)
     if arr.shape[1] != 7:
-        raise ValueError("Unexpected data fromat")
+        raise ValueError("Unexpected data format")
 
     def timestr2datetime64_12H(datetime_bytes: bytes) -> np.datetime64:
         return datetime64(

doppy/raw/wls70.py

@@ -33,6 +33,7 @@ class Wls70:
     ]  # v := meridional wind?, dim: (time, altitude)
     vertical_wind: npt.NDArray[np.float64]  # w := vertical wind?, dim: (time, altitude)
     system_id: str
+    cnr_threshold: float
 
     @classmethod
     def from_srcs(
@@ -111,6 +112,7 @@ class Wls70:
                 meridional_wind=self.meridional_wind[index],
                 vertical_wind=self.vertical_wind[index],
                 system_id=self.system_id,
+                cnr_threshold=self.cnr_threshold,
             )
         raise TypeError
 
@@ -137,6 +139,9 @@ class Wls70:
             meridional_wind=np.concatenate(tuple(r.meridional_wind for r in raws)),
             vertical_wind=np.concatenate(tuple(r.vertical_wind for r in raws)),
             system_id=merge_all_equal("system_id", [r.system_id for r in raws]),
+            cnr_threshold=merge_all_equal(
+                "cnr_threshold", [r.cnr_threshold for r in raws]
+            ),
         )
 
     def non_strictly_increasing_timesteps_removed(self) -> Wls70:
@@ -158,6 +163,7 @@ def _raw_rs_to_wls70(
     info, cols, data = raw_rs
     altitude = info["altitude"]
     system_id = info["system_id"]
+    cnr_threshold = float(info["cnr_threshold"])
     data = data.reshape(-1, len(cols))
     time_ts = data[:, 0]
     time = np.array([datetime64(datetime.utcfromtimestamp(ts)) for ts in time_ts])
@@ -173,7 +179,10 @@ def _raw_rs_to_wls70(
     u = data[:, 9::8]
     v = data[:, 10::8]
     w = data[:, 11::8]
-
+    mask = (np.abs(u) > 90) | (np.abs(v) > 90) | (np.abs(w) > 90)
+    u[mask] = np.nan
+    v[mask] = np.nan
+    w[mask] = np.nan
     return Wls70(
         time=time,
         altitude=altitude,
@@ -189,4 +198,5 @@ def _raw_rs_to_wls70(
         meridional_wind=v,
         vertical_wind=w,
         system_id=system_id,
+        cnr_threshold=cnr_threshold,
     )

doppy-0.2.4.dist-info/METADATA

@@ -0,0 +1,137 @@
+Metadata-Version: 2.3
+Name: doppy
+Version: 0.2.4
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Intended Audience :: Science/Research
+Classifier: Operating System :: OS Independent
+Requires-Dist: requests
+Requires-Dist: urllib3
+Requires-Dist: numpy
+Requires-Dist: netcdf4
+Requires-Dist: typer
+Requires-Dist: matplotlib
+Requires-Dist: scikit-learn
+Requires-Dist: scipy
+Requires-Dist: mypy ; extra == 'dev'
+Requires-Dist: ruff ; extra == 'dev'
+Requires-Dist: pytest ; extra == 'dev'
+Requires-Dist: types-requests ; extra == 'dev'
+Requires-Dist: py-spy ; extra == 'dev'
+Requires-Dist: maturin ==1.4 ; extra == 'dev'
+Requires-Dist: release-version ; extra == 'dev'
+Requires-Dist: pre-commit ; extra == 'dev'
+Provides-Extra: dev
+License-File: LICENSE
+License-File: LICENSE
+Author: Niko Leskinen <niko.leskinen@fmi.fi>
+Author-email: Niko Leskinen <niko.leskinen@fmi.fi>
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Homepage, https://github.com/actris-cloudnet/doppy
+Project-URL: Repository, https://github.com/actris-cloudnet/doppy
+Project-URL: Changelog, https://github.com/actris-cloudnet/doppy/blob/main/CHANGELOG.md
+Project-URL: Bug Tracker, https://github.com/actris-cloudnet/doppy/issues
+
+# Doppy – Doppler wind lidar processing
+
+[![CI](https://github.com/actris-cloudnet/doppy/actions/workflows/ci.yml/badge.svg)](https://github.com/actris-cloudnet/doppy/actions/workflows/ci.yml)
+[![PyPI version](https://badge.fury.io/py/doppy.svg)](https://badge.fury.io/py/doppy)
+
+## Products
+
+- [Stare](https://github.com/actris-cloudnet/doppy/blob/main/src/doppy/product/stare.py): [Examples](https://cloudnet.fmi.fi/search/visualizations?experimental=true&product=doppler-lidar&dateFrom=2024-06-05&dateTo=2024-06-05)
+- [Wind](https://github.com/actris-cloudnet/doppy/blob/main/src/doppy/product/wind.py): [Examples](https://cloudnet.fmi.fi/search/visualizations?experimental=true&product=doppler-lidar-wind&dateFrom=2024-06-05&dateTo=2024-06-05)
+
+## Instruments
+
+- HALO Photonics Streamline lidars (stare, wind)
+- Leosphere WindCube WLS200S (wind)
+- Leosphere WindCube WLS70 (wind)
+
+## Install
+
+```sh
+pip install doppy
+```
+
+## Usage
+
+```python
+import doppy
+
+stare = doppy.product.Stare.from_halo_data(
+    data=LIST_OF_STARE_FILE_PATHS,
+    data_bg=LIST_OF_BACKGROUND_FILE_PATHS,
+    bg_correction_method=doppy.options.BgCorrectionMethod.FIT,
+)
+
+
+(
+    doppy.netcdf.Dataset(FILENAME)
+    .add_dimension("time")
+    .add_dimension("range")
+    .add_time(
+        name="time",
+        dimensions=("time",),
+        standard_name="time",
+        long_name="Time UTC",
+        data=stare.time,
+        dtype="f8",
+    )
+    .add_variable(
+        name="range",
+        dimensions=("range",),
+        units="m",
+        data=stare.radial_distance,
+        dtype="f4",
+    )
+    .add_variable(
+        name="elevation",
+        dimensions=("time",),
+        units="degrees",
+        data=stare.elevation,
+        dtype="f4",
+        long_name="elevation from horizontal",
+    )
+    .add_variable(
+        name="beta_raw",
+        dimensions=("time", "range"),
+        units="sr-1 m-1",
+        data=stare.beta,
+        dtype="f4",
+    )
+    .add_variable(
+        name="beta",
+        dimensions=("time", "range"),
+        units="sr-1 m-1",
+        data=stare.beta,
+        dtype="f4",
+        mask=stare.mask,
+    )
+    .add_variable(
+        name="v",
+        dimensions=("time", "range"),
+        units="m s-1",
+        long_name="Doppler velocity",
+        data=stare.radial_velocity,
+        dtype="f4",
+        mask=stare.mask,
+    )
+    .add_scalar_variable(
+        name="wavelength",
+        units="m",
+        standard_name="radiation_wavelength",
+        data=stare.wavelength,
+        dtype="f4",
+    )
+    .add_attribute("serial_number", stare.system_id)
+    .add_attribute("doppy_version", doppy.__version__)
+).close()
+
+```
+

{doppy-0.2.2.dist-info → doppy-0.2.4.dist-info}/RECORD

@@ -1,8 +1,7 @@
-doppy-0.2.2.dist-info/METADATA,sha256=pB8rf-ENhdOyoHh9mbT0IOuxQeQ1_weyuWro8BpE5MU,1793
-doppy-0.2.2.dist-info/WHEEL,sha256=d75zPPyDx5l542fz5cKSMKvSEn203Dzoi4bYqdZk0D8,95
-doppy-0.2.2.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.2.2.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
-doppy-0.2.2.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
+doppy-0.2.4.dist-info/METADATA,sha256=ZkylqwgahVuTks7ZPyEqmkuvmoFPHIlzHGZIw3uBkNU,4243
+doppy-0.2.4.dist-info/WHEEL,sha256=ooo3OLxJB34JFfOmPzfiM9QlB2wmB_Cl3_kcSm8NkLg,95
+doppy-0.2.4.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.2.4.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
 doppy/bench.py,sha256=fLN2iS5mmoYH4qZjD80Vl1h9lp3C-KDfhj9fteWRPtM,260
 doppy/data/api.py,sha256=c3zbZI3IV7HnzhyFzJpUPOFT20eYFuQlJ5K_1ZEe1Pg,1921
 doppy/data/cache.py,sha256=VNPB3XsWGwY2bNXBs1r_sEWF4qBq_U7sJSlSmt1Rxm8,1033
@@ -10,20 +9,20 @@ doppy/data/exceptions.py,sha256=JOyekvUO-Ew4ZVezf3_IxZOrPN0IksfUILd8R2YcSts,95
 doppy/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/defaults.py,sha256=nhxcZcFd2jyDVbq0azwtekEJEjiz8k21MZmXFlSXAjo,40
 doppy/exceptions.py,sha256=YNEyz4r0ObzZHZ9re83K3wZlR2CRI1GyhH0vvFGasgQ,148
-doppy/netcdf.py,sha256=UnuecY_yEijEDpsuOBCj3EGeWMXtyRIOlLAC1UVUVHY,3527
+doppy/netcdf.py,sha256=NnTkZEb5gBInvrvn7uD91V2t4e_WlCOrLzhPm00azOE,3716
 doppy/options.py,sha256=uyIKM_G2GtbmV6Gve8o13eIShQqUwsnYZ41mhX2ypGE,218
-doppy/product/stare.py,sha256=hJPGujuMiOM424XtbCWWEdnD21zl9qg4dgZXnT-CDfk,20521
-doppy/product/wind.py,sha256=JT4DAwE1hl7NbE53mkZl4a-5RQb30IlydzfpDwkOoZM,13454
+doppy/product/stare.py,sha256=sh2HuKEWa-gaWZCbjbozYFA0oRUZa4U3nG9FpgqtoKM,20522
+doppy/product/wind.py,sha256=f52owv_pzfUDiMzLXv6IqHFWHWdLXmGUIgBCXjOhPnk,13455
 doppy/product/__init__.py,sha256=kHVF77la8tzWKKpiM9eNWT-eAkAUd4uwb0wJFp62QLk,177
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/raw/halo_bg.py,sha256=9K7E9smahGOqDIYnA-9m-Di3QsDY0PR2FH4Yd_oYiEY,4951
-doppy/raw/halo_hpl.py,sha256=OMVa6K8TqUnhwE5w3w_qy5Qi_Vg6S2lHwKEaIq5iGG0,19006
-doppy/raw/halo_sys_params.py,sha256=L3cFf1jATLMkVf2ViSbrmom-rZu7dn1Nq1J354xO98A,4041
+doppy/raw/halo_hpl.py,sha256=VF8JQ_5N8adLsGNJOlhvKwz0LtNd4oCU76hETe5Vuhk,19007
+doppy/raw/halo_sys_params.py,sha256=nT9r4F-H0Rf5njee5rYzzLTCm7vm3N_pdJqrW6RtyK4,4041
 doppy/raw/windcube.py,sha256=h_kqlQf2Pz59xg5EVSROiUlcA2RQp2jkGIxohmN1QOE,10166
-doppy/raw/wls70.py,sha256=n5I9T7mWPIb1LI0kUrUz4gP9v8mjX76kx1EUBFeeyA0,7200
+doppy/raw/wls70.py,sha256=2OhjmQ1SoAmjN4npOKFH0eFLyo9RssO7sr-gOtxjAho,7622
 doppy/raw/__init__.py,sha256=J06q7iykSAWIif4XAxI1jOszkARvLFBR1eU-B9yUXMw,235
 doppy/utils.py,sha256=lENDTzMVjCOA15Va9WZ6cou-foL5bGbNt4-NbDcnXpc,223
 doppy/__init__.py,sha256=Af7_8p3oN1nTqS9fo0mVKVuiKf5CAEK69uQa32CSFBA,197
 doppy/__main__.py,sha256=38hIWWfanILuBBGorQiAaleSC4qYJoIxuzVBkxf7Dng,371
-doppy/rs.pyd,sha256=meDRBEyGkaPwvDvu0Xx0w13e7y6TPcju4J4M6dXvFLU,2111488
-doppy-0.2.2.dist-info/RECORD,,
+doppy/rs.pyd,sha256=dYpxLPIMM6YD1kr2MDlb2gypV4QhJ2LsQgxBRUCT3dE,2103808
+doppy-0.2.4.dist-info/RECORD,,

{doppy-0.2.2.dist-info → doppy-0.2.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.5.1)
+Generator: maturin (1.7.0)
 Root-Is-Purelib: false
 Tag: cp310-abi3-win_amd64

doppy-0.2.2.dist-info/METADATA

@@ -1,44 +0,0 @@
-Metadata-Version: 2.3
-Name: doppy
-Version: 0.2.2
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Intended Audience :: Science/Research
-Classifier: Operating System :: OS Independent
-Requires-Dist: requests
-Requires-Dist: urllib3
-Requires-Dist: numpy
-Requires-Dist: netcdf4
-Requires-Dist: typer
-Requires-Dist: matplotlib
-Requires-Dist: scikit-learn
-Requires-Dist: scipy
-Requires-Dist: mypy ; extra == 'dev'
-Requires-Dist: ruff ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: types-requests ; extra == 'dev'
-Requires-Dist: py-spy ; extra == 'dev'
-Requires-Dist: maturin ==1.4 ; extra == 'dev'
-Requires-Dist: release-version ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Provides-Extra: dev
-License-File: LICENSE
-License-File: LICENSE
-Author: Niko Leskinen <niko.leskinen@fmi.fi>
-Author-email: Niko Leskinen <niko.leskinen@fmi.fi>
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Homepage, https://github.com/actris-cloudnet/doppy
-Project-URL: Repository, https://github.com/actris-cloudnet/doppy
-Project-URL: Changelog, https://github.com/actris-cloudnet/doppy/blob/main/CHANGELOG.md
-Project-URL: Bug Tracker, https://github.com/actris-cloudnet/doppy/issues
-
-# Doppy - Wind doppler lidar processing
-
-[![CI](https://github.com/actris-cloudnet/doppy/actions/workflows/ci.yml/badge.svg)](https://github.com/actris-cloudnet/doppy/actions/workflows/ci.yml)
-[![PyPI version](https://badge.fury.io/py/doppy.svg)](https://badge.fury.io/py/doppy)
-