doppy 0.5.5__cp310-abi3-macosx_10_12_x86_64.whl → 0.5.7__cp310-abi3-macosx_10_12_x86_64.whl

doppy/product/stare.py

@@ -113,7 +113,7 @@ class Stare:
             mask_radial_velocity=mask_radial_velocity,
             wavelength=wavelength,
             system_id=raw.system_id,
-            ray_info=RayAccumulationTime(raw.ray_accumulation_time),
+            ray_info=RayAccumulationTime(raw.ray_accumulation_time.astype(float)),
         )
 
     @classmethod

doppy/product/utils.py

@@ -0,0 +1,12 @@
+from collections import Counter
+
+import numpy as np
+import numpy.typing as npt
+
+
+def arr_to_rounded_set(arr: npt.NDArray[np.float64]) -> set[int]:
+    return set(int(x) for x in np.round(arr))
+
+
+def count_rounded(arr: npt.NDArray[np.float64]) -> Counter[int]:
+    return Counter(int(x) for x in np.round(arr))

doppy/product/wind.py

@@ -1,21 +1,18 @@
 from __future__ import annotations
 
 import functools
-from collections import defaultdict
+from collections import Counter
 from dataclasses import dataclass
 from io import BufferedIOBase
 from pathlib import Path
-from typing import Sequence, TypeAlias
+from typing import Sequence
 
 import numpy as np
 import numpy.typing as npt
 from scipy.ndimage import generic_filter
-from sklearn.cluster import KMeans
 
 import doppy
-
-# ngates, gate points, elevation angle, tuple of sorted azimuth angles
-SelectionGroupKeyType: TypeAlias = tuple[int, int, tuple[int, ...]]
+from doppy.product.utils import arr_to_rounded_set
 
 
 @dataclass
@@ -413,99 +410,51 @@ def _wrap_and_round_angle(a: np.float64) -> int:
     return int(np.round(a)) % 360
 
 
-def _group_scans(raw: doppy.raw.HaloHpl) -> npt.NDArray[np.int64]:
-    if len(raw.time) < 4:
-        raise ValueError("Expected at least 4 profiles to compute wind profile")
-    if raw.time.dtype != "<M8[us]":
-        raise TypeError("time expected to be in numpy datetime[us]")
-    time = raw.time.astype(np.float64) * 1e-6
-    timediff_in_seconds = np.diff(time)
-    kmeans = KMeans(n_clusters=2, n_init="auto").fit(timediff_in_seconds.reshape(-1, 1))
-    centers = kmeans.cluster_centers_.flatten()
-    scanstep_timediff = centers[np.argmin(centers)]
-
-    if scanstep_timediff < 0.1 or scanstep_timediff > 30:
-        raise ValueError(
-            "Time difference between profiles in one scan "
-            "expected to be between 0.1 and 30 seconds"
-        )
-    scanstep_timediff_upperbound = 2 * scanstep_timediff
-    groups_by_time = -1 * np.ones_like(time, dtype=np.int64)
-    groups_by_time[0] = 0
-    scan_index = 0
-    for i, (t_prev, t) in enumerate(zip(time[:-1], time[1:]), start=1):
-        if t - t_prev > scanstep_timediff_upperbound:
-            scan_index += 1
-        groups_by_time[i] = scan_index
-
-    return _subgroup_scans(raw, groups_by_time)
-
-
-def _subgroup_scans(
-    raw: doppy.raw.HaloHpl, time_groups: npt.NDArray[np.int64]
-) -> npt.NDArray[np.int64]:
-    """
-    Groups scans further based on the azimuth angles
-    """
-    group = -1 * np.ones_like(raw.time, dtype=np.int64)
-    i = -1
-    for time_group in set(time_groups):
-        i += 1
-        (pick,) = np.where(time_group == time_groups)
-        raw_group = raw[pick]
-        first_azimuth_angle = int(np.round(raw_group.azimuth[0])) % 360
-        group[pick[0]] = i
-        for j, azi in enumerate(
-            (int(np.round(azi)) % 360 for azi in raw_group.azimuth[1:]), start=1
-        ):
-            if azi == first_azimuth_angle:
-                i += 1
-            group[pick[j]] = i
-    return group
-
-
 def _select_raws_for_wind(
     raws: Sequence[doppy.raw.HaloHpl],
 ) -> Sequence[doppy.raw.HaloHpl]:
-    if len(raws) == 0:
+    counter: Counter[tuple[int, int]] = Counter()
+    filtered_raws = []
+    for raw in raws:
+        select = (1 < raw.elevation) & (raw.elevation < 85)
+        for el in arr_to_rounded_set(raw.elevation[select]):
+            select_el = raw.elevation.round().astype(int) == el
+            select_and = select & select_el
+
+            if _get_nrounded_angles(raw.azimuth[select_and]) > 3:
+                filtered_raws.append(raw[select_and])
+                counter.update(
+                    Counter(
+                        (raw.header.mergeable_hash(), el)
+                        for el in raw.elevation[select_and].round().astype(int)
+                    )
+                )
+    if len(counter) == 0:
         raise doppy.exceptions.NoDataError(
-            "Cannot select raws for wind from empty list"
+            "No scans with 1 < elevation angle < 85 and more than 3 azimuth angles"
         )
-    raws_wind = [
+    if len(counter) == 1:
+        return filtered_raws
+    # Else select angle closes to 75 from angles
+    # that have count larger than mean_count/2
+    mean_count = counter.total() / len(counter)
+    elevation, _, hash = sorted(
+        [
+            (el, abs(el - 75), hash)
+            for (hash, el), count in counter.items()
+            if count > mean_count / 2
+        ],
+        key=lambda x: x[1],
+    )[0]
+    elevation_set = {elevation}
+    raws = [
         raw
-        for raw in raws
-        if len(raw.elevation_angles) == 1
-        and (el := next(iter(raw.elevation_angles))) < 80
-        and el > 25
-        and len(raw.azimuth_angles) > 3
+        for raw in filtered_raws
+        if raw.header.mergeable_hash() == hash
+        and arr_to_rounded_set(raw.elevation) == elevation_set
     ]
-    if len(raws_wind) == 0:
-        raise doppy.exceptions.NoDataError(
-            "No data suitable for winds: "
-            "Multiple elevation angles or "
-            "elevation angle >= 80 or "
-            "elevation angle <= 25 or "
-            "no more than 3 azimuth angles"
-        )
-
-    groups: dict[SelectionGroupKeyType, int] = defaultdict(int)
-
-    for raw in raws_wind:
-        groups[_selection_key(raw)] += len(raw.time)
+    return raws
 
-    def key_func(key: SelectionGroupKeyType) -> int:
-        return groups[key]
 
-    select_tuple = max(groups, key=key_func)
-
-    return [raw for raw in raws_wind if _selection_key(raw) == select_tuple]
-
-
-def _selection_key(raw: doppy.raw.HaloHpl) -> SelectionGroupKeyType:
-    if len(raw.elevation_angles) != 1:
-        raise ValueError("Expected only one elevation angle")
-    return (
-        raw.header.mergeable_hash(),
-        next(iter(raw.elevation_angles)),
-        tuple(sorted(raw.azimuth_angles)),
-    )
+def _get_nrounded_angles(arr: npt.NDArray[np.float64]) -> int:
+    return len(set((x + 360) % 360 for x in arr_to_rounded_set(arr)))

doppy/raw/windcube.py

@@ -97,7 +97,7 @@ class WindCubeFixed:
         return self[sort_indices]
 
     def nan_profiles_removed(self) -> WindCubeFixed:
-        return self[np.array(~np.all(np.isnan(self.cnr), axis=1), dtype=np.bool)]
+        return self[np.array(~np.all(np.isnan(self.cnr), axis=1), dtype=np.bool_)]
 
 
 @dataclass

{doppy-0.5.5.dist-info → doppy-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doppy
-Version: 0.5.5
+Version: 0.5.7
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -29,10 +29,10 @@ Requires-Dist: release-version ; extra == 'dev'
 Requires-Dist: pre-commit ; extra == 'dev'
 Requires-Dist: xarray[io] ; extra == 'dev'
 Requires-Dist: seaborn ; extra == 'dev'
+Requires-Dist: tomli ; 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

{doppy-0.5.5.dist-info → doppy-0.5.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-doppy-0.5.5.dist-info/METADATA,sha256=27OPMIIi1ogb8fn0-B0agxyj7SISbbeH0IEzoVZOpL8,4355
-doppy-0.5.5.dist-info/WHEEL,sha256=FKI1F42ryd0ojULvDW3vjj8VV7OGrXUiIZa8fSa2dLk,105
-doppy-0.5.5.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.5.5.dist-info/licenses/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.5.7.dist-info/METADATA,sha256=X23iM9s-E_wEIwfbMpWVoAYWjvE9AZCtu_lvHHq8IUo,4348
+doppy-0.5.7.dist-info/WHEEL,sha256=Jg40yNLiW88BNCHsL6rrOWmIXhPDGjBBSOysfS8rqC0,105
+doppy-0.5.7.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.5.7.dist-info/licenses/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
 doppy/__init__.py,sha256=Z9aEUlbPRWRUAoB8_-djkgrJuS4-6pjem4-mVSB6Z9I,191
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
 doppy/bench.py,sha256=xUsmwLCjNLXwO9l-_SCfq62jxXJ4eiwkS-WlCejcqZE,308
@@ -15,19 +15,20 @@ doppy/netcdf.py,sha256=PuTCVK4yT4dkObo_w2D1lJroHg7l4DJFZxOi6jr1DkQ,4078
 doppy/options.py,sha256=73BDODO4OYHn2qOshhwz6u6G3J1kNd3uj6P0a3V4HBE,205
 doppy/product/__init__.py,sha256=C6s9cX20m9UwRsKo1lZH6TnYFfM5KmsX5MPUyShbgl4,235
 doppy/product/noise_utils.py,sha256=fP2bK2xfCUClQcDc_1FmLUUiU2d0KycrxkXLC5jmJAc,2629
-doppy/product/stare.py,sha256=RVHcW8eep91bH2GVobqDqsqswdRaFZ5SY4K_5fLSF3I,27180
+doppy/product/stare.py,sha256=5cvctg4zrwwj4B7knhYFrEwKqhcIxXstcNSnhbB6K04,27194
 doppy/product/stare_depol.py,sha256=gSlD13jGLRmHyTDADFs_MO6ECos6wwKF-TL7G7NwHAA,10718
 doppy/product/turbulence.py,sha256=hajTHFr6XXdul8oU9dw4Y58kBwRpUBIfiOfTcvSjq7M,8606
-doppy/product/wind.py,sha256=efBfYalILN2VvDiGpxP04mob-mCrdQFS9tdhReeyXiU,16787
+doppy/product/utils.py,sha256=1mngeUrs_mlRO3Z-bq5OWoFEMxX5uuosLVge1Jrp76s,310
+doppy/product/wind.py,sha256=QyabapzOen_4oXLikmhjAjtlmOis18Ady57hQnrlzw8,15060
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/raw/__init__.py,sha256=HE-7x27dfw-LJTvReZfspqzNx63Nl0v5ACdYs9EuOFQ,325
 doppy/raw/halo_bg.py,sha256=8t9j-SUF1yJht3vrT6KAYJQyxcg3W-0zr8h0jAEhWes,5815
 doppy/raw/halo_hpl.py,sha256=tK0H6LAOcoWqF4vvNu8VRCYq_spvcSTHRM4ju4gx5Lo,16828
 doppy/raw/halo_sys_params.py,sha256=jclE4RbVg63iS3rVNYzvErKYAa3CI1q64xj3oai5tMc,5250
 doppy/raw/utils.py,sha256=EOWIaxAZIiRYa9dI1j50cSd4I058Zq7sz1HOeipZFTg,422
-doppy/raw/windcube.py,sha256=HKAlU-TUVqA1sefRLOY5skM1twQaVe-MExlZoI40rK4,19149
+doppy/raw/windcube.py,sha256=uL6htoeyrJ-zrHV_QM748TT0HyfA3rw7t2dQORx0OAU,19150
 doppy/raw/wls70.py,sha256=OfPczHZPKX4iqCcyjSv0nmkr1osy4pu6krNUi0-G0vM,6319
 doppy/raw/wls77.py,sha256=ciRNy0U1a4OuxbsHGt9HMHAa3Qqukaw57QeNQdkWUj8,6460
-doppy/rs.abi3.so,sha256=ABdHSEGhi67TspJZcUofhsLKVN5s64RuHBFI6JkV9po,2705596
+doppy/rs.abi3.so,sha256=YdozFYjqh-bvSVUpUSFgDe9u6AtKhoaokV0HmjTFOC0,2708828
 doppy/utils.py,sha256=cY-tWrArrROX7lg_zJ2M4QJ6GUnU_BjhkUYL5aG9kbA,790
-doppy-0.5.5.dist-info/RECORD,,
+doppy-0.5.7.dist-info/RECORD,,

{doppy-0.5.5.dist-info → doppy-0.5.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.9.1)
+Generator: maturin (1.9.4)
 Root-Is-Purelib: false
 Tag: cp310-abi3-macosx_10_12_x86_64