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

doppy/product/__init__.py

@@ -1,4 +1,5 @@
 from doppy.product.stare import Stare
+from doppy.product.wind import Options as WindOptions
 from doppy.product.wind import Wind
 
-__all__ = ["Stare", "Wind"]
+__all__ = ["Stare", "Wind", "WindOptions"]

doppy/product/stare.py

@@ -27,6 +27,7 @@ class Stare:
     radial_velocity: npt.NDArray[np.float64]
     mask: npt.NDArray[np.bool_]
     wavelength: float
+    system_id: str
 
     @classmethod
     def from_halo_data(
@@ -89,6 +90,7 @@ class Stare:
             radial_velocity=raw.radial_velocity,
             mask=mask,
             wavelength=wavelength,
+            system_id=raw.header.system_id,
         )
 
 

doppy/product/wind.py

@@ -18,6 +18,11 @@ import doppy
 SelectionGroupKeyType: TypeAlias = tuple[int, int, tuple[int, ...]]
 
 
+@dataclass
+class Options:
+    azimuth_offset_deg: float | None
+
+
 @dataclass
 class Wind:
     time: npt.NDArray[np.datetime64]
@@ -26,6 +31,7 @@ class Wind:
     meridional_wind: npt.NDArray[np.float64]
     vertical_wind: npt.NDArray[np.float64]
     mask: npt.NDArray[np.bool_]
+    system_id: str
 
     @functools.cached_property
     def horizontal_wind_speed(self) -> npt.NDArray[np.float64]:
@@ -44,6 +50,7 @@ class Wind:
         | Sequence[Path]
         | Sequence[bytes]
         | Sequence[BufferedIOBase],
+        options: Options | None = None,
     ) -> Wind:
         raws = doppy.raw.HaloHpl.from_srcs(data)
 
@@ -59,6 +66,9 @@ class Wind:
         if len(raw.time) == 0:
             raise doppy.exceptions.NoDataError("No suitable data for the wind product")
 
+        if options and options.azimuth_offset_deg:
+            raw.azimuth += options.azimuth_offset_deg
+
         groups = _group_scans_by_azimuth_rotation(raw)
         time_list = []
         elevation_list = []
@@ -93,6 +103,7 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.header.system_id,
         )
 
     @classmethod
@@ -102,6 +113,7 @@ class Wind:
         | Sequence[Path]
         | Sequence[bytes]
         | Sequence[BufferedIOBase],
+        options: Options | None = None,
     ) -> Wind:
         raws = doppy.raw.WindCube.from_vad_srcs(data)
 
@@ -117,6 +129,9 @@ class Wind:
         if len(raw.time) == 0:
             raise doppy.exceptions.NoDataError("No suitable data for the wind product")
 
+        if options and options.azimuth_offset_deg:
+            raw.azimuth += options.azimuth_offset_deg
+
         time_list = []
         elevation_list = []
         wind_list = []
@@ -147,6 +162,7 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.system_id,
         )
 
     @classmethod
@@ -156,6 +172,7 @@ class Wind:
         | Sequence[Path]
         | Sequence[bytes]
         | Sequence[BufferedIOBase],
+        options: Options | None = None,
     ) -> Wind:
         raws = doppy.raw.Wls70.from_srcs(data)
 
@@ -167,6 +184,20 @@ class Wind:
             .sorted_by_time()
             .non_strictly_increasing_timesteps_removed()
         )
+
+        if options and options.azimuth_offset_deg:
+            theta = np.deg2rad(options.azimuth_offset_deg)
+            cos_theta = np.cos(theta)
+            sin_theta = np.sin(theta)
+
+            meridional_wind = (
+                sin_theta * raw.zonal_wind + cos_theta * raw.meridional_wind
+            )
+            zonal_wind = cos_theta * raw.zonal_wind - sin_theta * raw.meridional_wind
+        else:
+            meridional_wind = raw.meridional_wind
+            zonal_wind = raw.zonal_wind
+
         mask = (
             np.isnan(raw.meridional_wind)
             | np.isnan(raw.zonal_wind)
@@ -175,10 +206,11 @@ class Wind:
         return Wind(
             time=raw.time,
             height=raw.altitude,
-            zonal_wind=raw.zonal_wind,
-            meridional_wind=raw.meridional_wind,
+            zonal_wind=zonal_wind,
+            meridional_wind=meridional_wind,
             vertical_wind=raw.vertical_wind,
             mask=mask,
+            system_id=raw.system_id,
         )
 
 

doppy/raw/halo_hpl.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from io import BufferedIOBase
 from os.path import commonprefix
 from pathlib import Path
-from typing import Any, Sequence, TypeVar, cast
+from typing import Any, Sequence, cast
 
 import numpy as np
 import numpy.typing as npt
@@ -16,8 +16,7 @@ from numpy import datetime64, timedelta64
 
 import doppy
 from doppy import exceptions
-
-T = TypeVar("T")
+from doppy.utils import merge_all_equal
 
 
 @dataclass
@@ -258,18 +257,12 @@ class HaloHplHeader:
         )
 
 
-def _merger(key: str, lst: list[T]) -> T:
-    if len(set(lst)) != 1:
-        raise ValueError(f"Cannot merge header key {key} values {lst}")
-    return lst[0]
-
-
 def _merge_headers(headers: list[HaloHplHeader]) -> HaloHplHeader:
     return HaloHplHeader(
         filename=commonprefix([h.filename for h in headers]),
         start_time=np.min([h.start_time for h in headers]),
         **{
-            key: _merger(key, [getattr(h, key) for h in headers])
+            key: merge_all_equal(key, [getattr(h, key) for h in headers])
             for key in (
                 "gate_points",
                 "nrays",

doppy/raw/windcube.py

@@ -10,6 +10,8 @@ import numpy.typing as npt
 from netCDF4 import Dataset, num2date
 from numpy import datetime64
 
+from doppy.utils import merge_all_equal
+
 
 @dataclass
 class WindCube:
@@ -22,6 +24,7 @@ class WindCube:
     radial_velocity: npt.NDArray[np.float64]  # dim: (time, radial_distance)
     radial_velocity_confidence: npt.NDArray[np.float64]  # dim: (time, radial_distance)
     scan_index: npt.NDArray[np.int64]
+    system_id: str
 
     @classmethod
     def from_vad_srcs(
@@ -53,6 +56,7 @@ class WindCube:
                 [r.radial_velocity_confidence for r in raws]
             ),
             cnr=np.concatenate([r.cnr for r in raws]),
+            system_id=merge_all_equal("system_id", [r.system_id for r in raws]),
         )
 
     def __getitem__(
@@ -75,6 +79,7 @@ class WindCube:
                 radial_velocity_confidence=self.radial_velocity_confidence[index],
                 cnr=self.cnr[index],
                 scan_index=self.scan_index[index],
+                system_id=self.system_id,
             )
         raise TypeError
 
@@ -189,6 +194,7 @@ def _from_vad_src(nc: Dataset) -> WindCube:
         radial_velocity=np.concatenate(radial_wind_speed_list),
         radial_velocity_confidence=np.concatenate(radial_wind_speed_confidence_list),
         cnr=np.concatenate(cnr_list),
+        system_id=nc.instrument_name,
     )
 
 

doppy/raw/wls70.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from io import BufferedIOBase
 from pathlib import Path
-from typing import Sequence
+from typing import Any, Sequence
 
 import numpy as np
 import numpy.typing as npt
@@ -12,6 +12,7 @@ from numpy import datetime64
 
 import doppy
 from doppy import exceptions
+from doppy.utils import merge_all_equal
 
 
 @dataclass
@@ -31,6 +32,7 @@ class Wls70:
         np.float64
     ]  # v := meridional wind?, dim: (time, altitude)
     vertical_wind: npt.NDArray[np.float64]  # w := vertical wind?, dim: (time, altitude)
+    system_id: str
 
     @classmethod
     def from_srcs(
@@ -108,6 +110,7 @@ class Wls70:
                 zonal_wind=self.zonal_wind[index],
                 meridional_wind=self.meridional_wind[index],
                 vertical_wind=self.vertical_wind[index],
+                system_id=self.system_id,
             )
         raise TypeError
 
@@ -133,6 +136,7 @@ class Wls70:
             zonal_wind=np.concatenate(tuple(r.zonal_wind for r in raws)),
             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]),
         )
 
     def non_strictly_increasing_timesteps_removed(self) -> Wls70:
@@ -149,12 +153,11 @@ class Wls70:
 
 
 def _raw_rs_to_wls70(
-    raw_rs: tuple[
-        dict[str, npt.NDArray[np.float64]], list[str], npt.NDArray[np.float64]
-    ],
+    raw_rs: tuple[dict[str, Any], list[str], npt.NDArray[np.float64]],
 ) -> Wls70:
     info, cols, data = raw_rs
     altitude = info["altitude"]
+    system_id = info["system_id"]
     data = data.reshape(-1, len(cols))
     time_ts = data[:, 0]
     time = np.array([datetime64(datetime.utcfromtimestamp(ts)) for ts in time_ts])
@@ -185,4 +188,5 @@ def _raw_rs_to_wls70(
         zonal_wind=u,
         meridional_wind=v,
         vertical_wind=w,
+        system_id=system_id,
     )

doppy/utils.py

@@ -0,0 +1,9 @@
+from typing import TypeVar
+
+T = TypeVar("T")
+
+
+def merge_all_equal(key: str, lst: list[T]) -> T:
+    if len(set(lst)) != 1:
+        raise ValueError(f"Cannot merge header key {key} values {lst}")
+    return lst[0]

{doppy-0.2.0.dist-info → doppy-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.2.0
+Version: 0.2.2
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

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

@@ -1,8 +1,8 @@
-doppy-0.2.0.dist-info/METADATA,sha256=40KlrlwFO1uGDar8ehIYYYXltszTCDSi2grzI4wPgb0,1793
-doppy-0.2.0.dist-info/WHEEL,sha256=d75zPPyDx5l542fz5cKSMKvSEn203Dzoi4bYqdZk0D8,95
-doppy-0.2.0.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.2.0.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
-doppy-0.2.0.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
+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/bench.py,sha256=fLN2iS5mmoYH4qZjD80Vl1h9lp3C-KDfhj9fteWRPtM,260
 doppy/data/api.py,sha256=c3zbZI3IV7HnzhyFzJpUPOFT20eYFuQlJ5K_1ZEe1Pg,1921
 doppy/data/cache.py,sha256=VNPB3XsWGwY2bNXBs1r_sEWF4qBq_U7sJSlSmt1Rxm8,1033
@@ -12,17 +12,18 @@ doppy/defaults.py,sha256=nhxcZcFd2jyDVbq0azwtekEJEjiz8k21MZmXFlSXAjo,40
 doppy/exceptions.py,sha256=YNEyz4r0ObzZHZ9re83K3wZlR2CRI1GyhH0vvFGasgQ,148
 doppy/netcdf.py,sha256=UnuecY_yEijEDpsuOBCj3EGeWMXtyRIOlLAC1UVUVHY,3527
 doppy/options.py,sha256=uyIKM_G2GtbmV6Gve8o13eIShQqUwsnYZ41mhX2ypGE,218
-doppy/product/stare.py,sha256=Er_LA_tk16hpBL7cWJxQaVO914GAtzOC03cGY4Ij85Q,20456
-doppy/product/wind.py,sha256=H8bBZChAPcjlnYLj7HhqGs__kcCHrRGeKr2tf2E_LlU,12394
-doppy/product/__init__.py,sha256=dOyY9_lLv6l3-_vtmJU18zOrE86SL0LHovQWQtwynnU,107
+doppy/product/stare.py,sha256=hJPGujuMiOM424XtbCWWEdnD21zl9qg4dgZXnT-CDfk,20521
+doppy/product/wind.py,sha256=JT4DAwE1hl7NbE53mkZl4a-5RQb30IlydzfpDwkOoZM,13454
+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=x1xJVJKsKtNXPHqgIVyBseV9KpTifTK15URcBlAfRfE,19153
+doppy/raw/halo_hpl.py,sha256=OMVa6K8TqUnhwE5w3w_qy5Qi_Vg6S2lHwKEaIq5iGG0,19006
 doppy/raw/halo_sys_params.py,sha256=L3cFf1jATLMkVf2ViSbrmom-rZu7dn1Nq1J354xO98A,4041
-doppy/raw/windcube.py,sha256=aHAKN1tgyPNpCVBY4co9FwM6vMLu4swqVoFFhpDT33M,9939
-doppy/raw/wls70.py,sha256=yZKz1UO5ghqU6XO9-7poABwSKVgUr9BDgoKZ59E006E,6980
+doppy/raw/windcube.py,sha256=h_kqlQf2Pz59xg5EVSROiUlcA2RQp2jkGIxohmN1QOE,10166
+doppy/raw/wls70.py,sha256=n5I9T7mWPIb1LI0kUrUz4gP9v8mjX76kx1EUBFeeyA0,7200
 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=k_6SKD65g3DHSNWmDaNeqUfnVv_mZ8cLBJ_EeLK-FYA,2157568
-doppy-0.2.0.dist-info/RECORD,,
+doppy/rs.pyd,sha256=meDRBEyGkaPwvDvu0Xx0w13e7y6TPcju4J4M6dXvFLU,2111488
+doppy-0.2.2.dist-info/RECORD,,