doppy 0.0.4__cp310-abi3-macosx_10_12_x86_64.whl → 0.0.5__cp310-abi3-macosx_10_12_x86_64.whl

doppy/product/wind.py

@@ -13,7 +13,6 @@ from scipy.ndimage import generic_filter
 from sklearn.cluster import KMeans
 
 import doppy
-from doppy import options
 
 # ngates, elevation angle, tuple of sorted azimuth angles
 SelectionGroupKeyType: TypeAlias = tuple[int, int, tuple[int, ...]]
@@ -22,7 +21,7 @@ SelectionGroupKeyType: TypeAlias = tuple[int, int, tuple[int, ...]]
 @dataclass
 class Wind:
     time: npt.NDArray[np.datetime64]
-    height: npt.NDArray[np.datetime64]
+    height: npt.NDArray[np.float64]
     zonal_wind: npt.NDArray[np.float64]
     meridional_wind: npt.NDArray[np.float64]
     vertical_wind: npt.NDArray[np.float64]
@@ -34,9 +33,9 @@ class Wind:
 
     @functools.cached_property
     def horizontal_wind_direction(self) -> npt.NDArray[np.float64]:
-        direction =  np.arctan2(self.zonal_wind, self.meridional_wind)
-        direction[direction < 0] += 2*np.pi
-        return np.degrees(direction)
+        direction = np.arctan2(self.zonal_wind, self.meridional_wind)
+        direction[direction < 0] += 2 * np.pi
+        return np.array(np.degrees(direction), dtype=np.float64)
 
     @classmethod
     def from_halo_data(
@@ -77,7 +76,7 @@ class Wind:
         if not np.allclose(elevation, elevation[0]):
             raise ValueError("Elevation is expected to stay same")
         height = raw.radial_distance * np.sin(np.deg2rad(elevation[0]))
-        mask = _compute_mask(wind, raw.intensity, rmse)
+        mask = _compute_mask(wind, rmse)
         return Wind(
             time=time,
             height=height,
@@ -134,7 +133,9 @@ def _compute_wind(
     return time, elevation[0], wind, rmse
 
 
-def _compute_mask(wind, intensity, rmse):
+def _compute_mask(
+    wind: npt.NDArray[np.float64], rmse: npt.NDArray[np.float64]
+) -> npt.NDArray[np.bool_]:
     """
     Parameters
     ----------
@@ -144,20 +145,22 @@ def _compute_mask(wind, intensity, rmse):
     rmse (time,range)
     """
 
-    def neighbour_diff(X):
+    def neighbour_diff(X: npt.NDArray[np.float64]) -> npt.NDArray[np.float64]:
         mdiff = np.max(np.abs(X - X[len(X) // 2]))
-        return mdiff
+        return np.array(mdiff, dtype=np.float64)
 
     WIND_NEIGHBOUR_DIFFERENCE = 20
     neighbour_mask = np.any(
-        generic_filter(wind, neighbour_diff, size=(1, 3, 1)) > WIND_NEIGHBOUR_DIFFERENCE, axis=2
+        generic_filter(wind, neighbour_diff, size=(1, 3, 1))
+        > WIND_NEIGHBOUR_DIFFERENCE,
+        axis=2,
     )
 
     rmse_th = 5
-    return (rmse > rmse_th) | neighbour_mask
+    return np.array((rmse > rmse_th) | neighbour_mask, dtype=np.bool_)
 
 
-def _group_scans(raw: doppy.raw.HaloHpl):
+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]":
@@ -174,7 +177,7 @@ def _group_scans(raw: doppy.raw.HaloHpl):
             "expected to be between 0.1 and 30 seconds"
         )
     scanstep_timediff_upperbound = 2 * scanstep_timediff
-    groups_by_time = -1 * np.ones_like(time, dtype=int)
+    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):
@@ -185,11 +188,13 @@ def _group_scans(raw: doppy.raw.HaloHpl):
     return _subgroup_scans(raw, groups_by_time)
 
 
-def _subgroup_scans(raw: doppy.raw.HaloHpl, time_groups: npt.NDArray[np.int]):
+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=int)
+    group = -1 * np.ones_like(raw.time, dtype=np.int64)
     i = -1
     for time_group in set(time_groups):
         i += 1

{doppy-0.0.4.dist-info → doppy-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: doppy
-Version: 0.0.4
+Version: 0.0.5
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{doppy-0.0.4.dist-info → doppy-0.0.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
-doppy-0.0.4.dist-info/METADATA,sha256=UT81EmsMyVTsMwm3ObS-Lz3lhMZet5HpZqN4VBWetuk,1583
-doppy-0.0.4.dist-info/WHEEL,sha256=6lWwZR4XDMZCOGKxNbitp3oy9XC3VeW-i3RwU9wYcOc,105
-doppy-0.0.4.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.0.4.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
-doppy-0.0.4.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.0.5.dist-info/METADATA,sha256=n_NUKr3yktaNmPOZY4ERv9-D9G9FfmE-c2jfwnRWdjI,1583
+doppy-0.0.5.dist-info/WHEEL,sha256=6lWwZR4XDMZCOGKxNbitp3oy9XC3VeW-i3RwU9wYcOc,105
+doppy-0.0.5.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.0.5.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.0.5.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
 doppy/options.py,sha256=73BDODO4OYHn2qOshhwz6u6G3J1kNd3uj6P0a3V4HBE,205
 doppy/__init__.py,sha256=Z9aEUlbPRWRUAoB8_-djkgrJuS4-6pjem4-mVSB6Z9I,191
-doppy/product/wind.py,sha256=kyopdXhGYGpXo2o3ml9DRsWl3CwXIXksTGMBSE33M1Q,7327
+doppy/product/wind.py,sha256=GA8tzceKYSlBg0ic-gwGXtiVBlpD85V-fDTSnxsZs9E,7573
 doppy/product/__init__.py,sha256=lyp88zs7GBk8uUzkj8lxaXPuYwPa52xXeTwf5qwFddU,103
 doppy/product/stare.py,sha256=rqZJkC-y_aDJFiVnZZj3UzRboR6rzbV3Tlggmzrl16w,19600
 doppy/bench.py,sha256=iVNYveMVGGRES2oe3Orsn31jQFCKTXOmxRFuFiJ8_OA,248
@@ -22,5 +22,5 @@ doppy/raw/__init__.py,sha256=GrBbsTkoD2DH_Xwt6apZGwpT1cCIbfOWHzdQVjAPVh0,151
 doppy/raw/halo_bg.py,sha256=kO03yGlKS-DpMMGHYuy_BuidyeUL38TxT5vMn8H_8lE,4809
 doppy/raw/halo_hpl.py,sha256=Vp90S_nL9nhkQ4SkBNaFyr8i5kSWLzq6d50kvG3jW6I,17900
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
-doppy/rs.abi3.so,sha256=CcSjMt_tt9R4WNJ87IpklK_btyk8lU9-ksMHQ9dVHyA,2716472
-doppy-0.0.4.dist-info/RECORD,,
+doppy/rs.abi3.so,sha256=7gsnRLxHr7LW8LJn_ZuG4IGHX_ymtIqfJsz_Z8-_Cyg,2775816
+doppy-0.0.5.dist-info/RECORD,,