doppy 0.3.0__cp310-abi3-win_amd64.whl → 0.3.2__cp310-abi3-win_amd64.whl

doppy/product/stare.py

@@ -29,6 +29,28 @@ class Stare:
     wavelength: float
     system_id: str
 
+    def __getitem__(
+        self,
+        index: int
+        | slice
+        | list[int]
+        | npt.NDArray[np.int64]
+        | npt.NDArray[np.bool_]
+        | tuple[slice, slice],
+    ) -> Stare:
+        if isinstance(index, (int, slice, list, np.ndarray)):
+            return Stare(
+                time=self.time[index],
+                radial_distance=self.radial_distance,
+                elevation=self.elevation[index],
+                beta=self.beta[index],
+                radial_velocity=self.radial_velocity[index],
+                mask=self.mask[index],
+                wavelength=self.wavelength,
+                system_id=self.system_id,
+            )
+        raise TypeError
+
     @classmethod
     def from_halo_data(
         cls,

doppy/product/stare_depol.py

@@ -1,9 +1,18 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from io import BufferedIOBase
+from pathlib import Path
+from typing import Sequence
+
 import numpy as np
 import numpy.typing as npt
 
+from doppy import options
 from doppy.product.stare import Stare
 
 
+@dataclass
 class StareDepol:
     """
     Stare product with depolarisation ratio derived from co-polarised and
@@ -21,6 +30,9 @@ class StareDepol:
     beta
         An array of backscatter coefficients for the co-polarised signal, in
         sr-1 m-1.
+    beta_cross
+        An array of backscatter coefficients for the cross-polarised signal, in
+        sr-1 m-1.
     radial_velocity
         An array of radial velocities of the co-polarised signal, in m s-1.
     mask
@@ -33,26 +45,55 @@ class StareDepol:
     system_id
         A string identifier for the lidar.
 
+
     Raises
     ------
     ValueError
         If the input `co` and `cross` products have mismatched wavelengths,
         system IDs, radial distances, or elevation angles, this exception is
         raised.
+
+
+    References
+    ----------
+    Aerosol particle depolarization ratio at 1565 nm measured with a Halo Doppler lidar
+        authors: Ville Vakkari, Holger Baars, Stephanie Bohlmann, Johannes Bühl,
+            Mika Komppula, Rodanthi-Elisavet Mamouri, and Ewan James O'Connor
+        doi: https://doi.org/10.5194/acp-21-5807-2021
     """
 
     time: npt.NDArray[np.datetime64]
     radial_distance: npt.NDArray[np.float64]
     elevation: npt.NDArray[np.float64]
     beta: npt.NDArray[np.float64]
+    beta_cross: npt.NDArray[np.float64]
     radial_velocity: npt.NDArray[np.float64]
     mask: npt.NDArray[np.bool_]
     depolarisation: npt.NDArray[np.float64]
+    mask_depolarisation: npt.NDArray[np.bool_]
+    mask_beta_cross: npt.NDArray[np.bool_]
+    polariser_bleed_through: float
     wavelength: float
     system_id: str
 
-    def __init__(self, co: Stare, cross: Stare):
-        if co.wavelength != cross.wavelength:
+    def __init__(
+        self,
+        co: Stare,
+        cross: Stare,
+        polariser_bleed_through: float = 0.0,
+    ):
+        """
+        Parameters
+        ----------
+        co: Stare
+            The co-polarised data.
+        cross: Stare
+            The cross-polarised data. The `cross.time` array is expected to be sorted.
+        polariser_bleed_through: float, default=0.0
+            The amount of bleed-through from the polariser.
+        """
+
+        if not np.isclose(co.wavelength, cross.wavelength):
             raise ValueError(
                 "Different wavelength in co and cross: "
                 f"{co.wavelength} vs {cross.wavelength}"
@@ -62,22 +103,78 @@ class StareDepol:
                 "Different system ID in co and cross: "
                 f"{co.system_id} vs {cross.system_id}"
             )
-        if not np.allclose(co.radial_distance, cross.radial_distance):
+        if not np.allclose(co.radial_distance, cross.radial_distance, atol=1):
             raise ValueError("Different radial distance in co and cross")
 
-        time_ind = np.argmin(np.abs(co.time - cross.time[:, np.newaxis]), axis=0)
-        cross_elevation = cross.elevation[time_ind]
-        cross_beta = cross.beta[time_ind, :]
+        if co.beta.shape[1] != cross.beta.shape[1]:
+            raise ValueError(
+                "Range dimension mismatch in co and cross: "
+                f"{co.beta.shape[1]} vs {cross.beta.shape[1]}"
+            )
+
+        ind = np.searchsorted(cross.time, co.time, side="left")
+        pick_ind = ind < len(cross.time)
+        time_diff_threshold = 2 * np.median(np.diff(co.time))
+        co_cross_timediff_below_threshold = (
+            cross.time[ind[pick_ind]] - co.time[pick_ind] < time_diff_threshold
+        )
+        pick_ind[pick_ind] &= co_cross_timediff_below_threshold
 
-        if not np.allclose(co.elevation, cross_elevation):
+        if not np.allclose(
+            co.elevation[pick_ind], cross.elevation[ind[pick_ind]], atol=1
+        ):
             raise ValueError("Different elevation in co and cross")
 
+        depolarisation = np.full_like(co.beta, np.nan)
+        co_beta = co.beta[pick_ind]
+        depolarisation[pick_ind] = (
+            cross.beta[ind[pick_ind]] - polariser_bleed_through * co_beta
+        ) / co_beta
+        cross_beta = np.full_like(co.beta, np.nan)
+        cross_beta[pick_ind] = cross.beta[ind[pick_ind]]
+
         self.time = co.time
         self.radial_distance = co.radial_distance
         self.elevation = co.elevation
         self.beta = co.beta
+        self.beta_cross = cross_beta
         self.radial_velocity = co.radial_velocity
         self.mask = co.mask
-        self.depolarisation = cross_beta / co.beta
+        self.depolarisation = depolarisation
+        self.mask_depolarisation = np.isnan(depolarisation)
+        self.mask_beta_cross = np.isnan(self.beta_cross)
+        self.polariser_bleed_through = polariser_bleed_through
         self.wavelength = co.wavelength
         self.system_id = co.system_id
+
+    @classmethod
+    def from_halo_data(
+        cls,
+        co_data: Sequence[str]
+        | Sequence[Path]
+        | Sequence[bytes]
+        | Sequence[BufferedIOBase],
+        co_data_bg: Sequence[str]
+        | Sequence[Path]
+        | Sequence[tuple[bytes, str]]
+        | Sequence[tuple[BufferedIOBase, str]],
+        cross_data: Sequence[str]
+        | Sequence[Path]
+        | Sequence[bytes]
+        | Sequence[BufferedIOBase],
+        cross_data_bg: Sequence[str]
+        | Sequence[Path]
+        | Sequence[tuple[bytes, str]]
+        | Sequence[tuple[BufferedIOBase, str]],
+        bg_correction_method: options.BgCorrectionMethod,
+        polariser_bleed_through: float = 0,
+    ) -> StareDepol:
+        co = Stare.from_halo_data(
+            data=co_data, data_bg=co_data_bg, bg_correction_method=bg_correction_method
+        )
+        cross = Stare.from_halo_data(
+            data=cross_data,
+            data_bg=cross_data_bg,
+            bg_correction_method=bg_correction_method,
+        )
+        return cls(co, cross, polariser_bleed_through)

{doppy-0.3.0.dist-info → doppy-0.3.2.dist-info}/METADATA

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

{doppy-0.3.0.dist-info → doppy-0.3.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-doppy-0.3.0.dist-info/METADATA,sha256=Ev5A4AsPf6a-OyhbGFn5cqIK8XHRDmwYFMGg2mnHWEE,4243
-doppy-0.3.0.dist-info/WHEEL,sha256=ooo3OLxJB34JFfOmPzfiM9QlB2wmB_Cl3_kcSm8NkLg,95
-doppy-0.3.0.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.3.0.dist-info/license_files/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
+doppy-0.3.2.dist-info/METADATA,sha256=bQR6PLYTj9KbGk4o_L7UMDMjujoiSy9VQtFCjjwYk9I,4243
+doppy-0.3.2.dist-info/WHEEL,sha256=kQSgRz4wLs1NoHeP8cPfiUAbi-20athsJLkIuWHUegk,95
+doppy-0.3.2.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.3.2.dist-info/licenses/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
@@ -11,8 +11,8 @@ doppy/defaults.py,sha256=nhxcZcFd2jyDVbq0azwtekEJEjiz8k21MZmXFlSXAjo,40
 doppy/exceptions.py,sha256=YNEyz4r0ObzZHZ9re83K3wZlR2CRI1GyhH0vvFGasgQ,148
 doppy/netcdf.py,sha256=VkWGleFKef3bkWf2_LfCdJnR1LORIFc51cXDRoRdHFo,4023
 doppy/options.py,sha256=uyIKM_G2GtbmV6Gve8o13eIShQqUwsnYZ41mhX2ypGE,218
-doppy/product/stare.py,sha256=sh2HuKEWa-gaWZCbjbozYFA0oRUZa4U3nG9FpgqtoKM,20522
-doppy/product/stare_depol.py,sha256=rSi1nxC9VqiTse4xu4E733iJJUq9IC2EXKa_n3dIUWA,2980
+doppy/product/stare.py,sha256=lJlo0DggYSGCFveFCZrY4SHOsU01dcHrV8Naq6bBT7s,21239
+doppy/product/stare_depol.py,sha256=kf24wFDs1TBPrNag3URj2By5ermr5Q6RrAC-uNh7xxM,6389
 doppy/product/wind.py,sha256=f52owv_pzfUDiMzLXv6IqHFWHWdLXmGUIgBCXjOhPnk,13455
 doppy/product/__init__.py,sha256=xoBEXuhid-bvoof5Ogzpt1dKIhJgNMRyrAinCqUOUUI,241
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,5 +25,5 @@ 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=-gldLueqXNJls_220C85maa0oidYpfxu2Gs-ovk1-tU,2100736
-doppy-0.3.0.dist-info/RECORD,,
+doppy/rs.pyd,sha256=wiTo_4GBwfKe2bWxcvc1rLHOIPRL-Q22ieLuXuaX_5w,2100736
+doppy-0.3.2.dist-info/RECORD,,

{doppy-0.3.0.dist-info → doppy-0.3.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.7.0)
+Generator: maturin (1.7.1)
 Root-Is-Purelib: false
 Tag: cp310-abi3-win_amd64