doppy 0.2.0__cp310-abi3-macosx_10_12_x86_64.whl → 0.2.1__cp310-abi3-macosx_10_12_x86_64.whl

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

@@ -26,6 +26,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]:
@@ -93,6 +94,7 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.header.system_id,
         )
 
     @classmethod
@@ -147,6 +149,7 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.system_id,
         )
 
     @classmethod
@@ -179,6 +182,7 @@ class Wind:
             meridional_wind=raw.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.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.2.0
+Version: 0.2.1
 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.1.dist-info}/RECORD

@@ -1,15 +1,16 @@
-doppy-0.2.0.dist-info/METADATA,sha256=gCEKLklhaVBhxondzo0x-pLTJ48yuiV3O9krrKSBGZw,1789
-doppy-0.2.0.dist-info/WHEEL,sha256=HYZ_jUi0IGqtX7pjBFQby7ex6mkgDnUsBYfR-onY1Fw,105
-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=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
-doppy-0.2.0.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.1.dist-info/METADATA,sha256=0T7yh-b9uQUGEeBymLzElKfO6tw2QAlDqffDPUNda7k,1789
+doppy-0.2.1.dist-info/WHEEL,sha256=HYZ_jUi0IGqtX7pjBFQby7ex6mkgDnUsBYfR-onY1Fw,105
+doppy-0.2.1.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.2.1.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.1.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=t7P6lTp_Nu9HSwFAhCeVFQ0KGxULbT_0J4BuYACp_tE,12014
+doppy/product/wind.py,sha256=MAK-ZTx37gL7y-x3RbqN_QrZR9kjAiLxdIMn_c6M5UA,12151
 doppy/product/__init__.py,sha256=lyp88zs7GBk8uUzkj8lxaXPuYwPa52xXeTwf5qwFddU,103
-doppy/product/stare.py,sha256=_z1qdw756AkGHnzAj401ncq0n_azppzVcR8drb9parw,19844
+doppy/product/stare.py,sha256=aMhOA5yXjcnwgzAp4GvLF1HT1cD-Zuqg9sEQIPlxWa0,19907
 doppy/bench.py,sha256=iVNYveMVGGRES2oe3Orsn31jQFCKTXOmxRFuFiJ8_OA,248
 doppy/netcdf.py,sha256=uEiJfqxXxHwe5ghT6OpIu8xeY1HgWDW1ENTBlFLOGtE,3416
+doppy/utils.py,sha256=qPtIYBJPaKKTmRWwJI93TFUuhJg7CAoecpyHCm5ZyxI,214
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/exceptions.py,sha256=1tljrtzp0McQhB6INFXj4yfLjxj6mXor5jLF9HZjp1A,138
 doppy/defaults.py,sha256=-il4DWU1HPttlGFoVQTPC7R4pDZERoPvt3kw6xwMKrw,38
@@ -19,10 +20,10 @@ doppy/data/api.py,sha256=QaVKj304OPcu8OF5xgtduQzDis8Srn-I6UgR9qb2u9E,1863
 doppy/data/exceptions.py,sha256=6CS6OHIWq8CqlxiceEvC1j0EfWUYoIfM7dW88apQVn4,89
 doppy/raw/halo_sys_params.py,sha256=IXH40xBHyXCGX0ZE79KnSeXRj1wbqoqL0RYUQyBJqdE,3937
 doppy/raw/__init__.py,sha256=AMHyONuH0aUJUQz20EhlANaq9UjWJtSZf7kWUVx3ZjA,228
-doppy/raw/wls70.py,sha256=APuo6dSd7NFo7WORw7Uo1kI0JROCNAkDUwmHU653U1g,6792
+doppy/raw/wls70.py,sha256=paFT8PddRemtiDAXxkZVcMljCq_CFw1DHmxLHXY0ZhE,7008
 doppy/raw/halo_bg.py,sha256=kO03yGlKS-DpMMGHYuy_BuidyeUL38TxT5vMn8H_8lE,4809
-doppy/raw/halo_hpl.py,sha256=_hq0JCNPuZrt3yt4U2KphKvJVNx_Uh4bnGfKbVPRGoA,18625
-doppy/raw/windcube.py,sha256=TVqR3SwfUJYHtPJXnA_b6uUGo_ylVkGGEPob63Zcee0,9685
+doppy/raw/halo_hpl.py,sha256=VkWemJfGFu-tF-fkhjYwF6dCZPrNQanqL0NBFJVS-TQ,18485
+doppy/raw/windcube.py,sha256=ZaOswQJbVDPBYj5oU1pTYmsX8F-mKIbjJRZmLYEMXP0,9906
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
-doppy/rs.abi3.so,sha256=1_5Q7_kGJYsXWOWeyk1jkPDysEzGllJhaOpG5zKrx7E,2876456
-doppy-0.2.0.dist-info/RECORD,,
+doppy/rs.abi3.so,sha256=xJ24N0vZB2LmuWNoCt2wUI4f1gFnUVOh5NxgvYPjlSE,2876040
+doppy-0.2.1.dist-info/RECORD,,