doppy 0.2.0__tar.gz → 0.2.2__tar.gz

{doppy-0.2.0 → doppy-0.2.2}/Cargo.lock

@@ -106,7 +106,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "doppy_rs"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "doprs",
  "numpy",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "doprs"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "chrono",
  "rayon",

{doppy-0.2.0 → doppy-0.2.2}/Cargo.toml

@@ -4,6 +4,6 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.2.0"
+version = "0.2.2"
 authors = ["Niko Leskinen <niko.leskinen@fmi.fi>"]
 license-file = "LICENSE"

{doppy-0.2.0 → doppy-0.2.2}/PKG-INFO

@@ -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 → doppy-0.2.2}/crates/doppy_rs/src/raw/wls70.rs

@@ -68,6 +68,7 @@ pub fn from_filename_src(py: Python, filename: String) -> PyResult<PyReturnType>
 fn convert_to_python(py: Python, raw: doprs::raw::wls70::Wls70) -> PyResult<PyReturnType> {
     let info_dict = PyDict::new(py);
     info_dict.set_item("altitude", raw.info.altitude.as_slice().to_pyarray(py))?;
+    info_dict.set_item("system_id", raw.info.system_id)?;
     Ok((
         info_dict,
         PyList::new(py, raw.data_columns),

{doppy-0.2.0 → doppy-0.2.2}/crates/doprs/src/raw/wls70.rs

@@ -16,6 +16,7 @@ pub struct Wls70 {
 #[derive(Debug, Default, Clone)]
 pub struct Info {
     pub altitude: Vec<f64>,
+    pub system_id: String,
 }
 
 pub fn from_file_src(mut file: &File) -> Result<Wls70, RawParseError> {
@@ -132,6 +133,14 @@ fn parse_info(info_str: &[u8]) -> Result<Info, RawParseError> {
                     })
                     .collect::<Result<Vec<f64>, _>>()?;
             }
+            b if b.starts_with(b"ID System=") => {
+                info.system_id = std::str::from_utf8(&line[10..])
+                    .map(|s| s.trim())
+                    .map_err(|_| RawParseError {
+                        message: "UTF-8 conversion error".into(),
+                    })?
+                    .to_string();
+            }
             _ => (),
         }
     }

doppy-0.2.2/src/doppy/product/__init__.py

@@ -0,0 +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", "WindOptions"]

{doppy-0.2.0 → doppy-0.2.2}/src/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-0.2.0 → doppy-0.2.2}/src/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-0.2.0 → doppy-0.2.2}/src/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-0.2.0 → doppy-0.2.2}/src/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-0.2.0 → doppy-0.2.2}/src/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-0.2.2/src/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/src/doppy/product/__init__.py

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