doppy 0.0.1__tar.gz → 0.0.3__tar.gz

{doppy-0.0.1 → doppy-0.0.3}/Cargo.lock

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

{doppy-0.0.1 → doppy-0.0.3}/Cargo.toml

@@ -2,9 +2,8 @@
 members = ["crates/*"]
 resolver = "2"
 
-
 [workspace.package]
 edition = "2021"
-version = "0.0.1"
+version = "0.0.3"
 authors = ["Niko Leskinen <niko.leskinen@fmi.fi>"]
 license-file = "LICENSE"

{doppy-0.0.1 → doppy-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: doppy
-Version: 0.0.1
+Version: 0.0.3
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -23,6 +23,8 @@ Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: types-requests ; extra == 'dev'
 Requires-Dist: py-spy ; extra == 'dev'
 Requires-Dist: maturin ; extra == 'dev'
+Requires-Dist: release-version ; extra == 'dev'
+Requires-Dist: pre-commit ; extra == 'dev'
 Provides-Extra: dev
 License-File: LICENSE
 License-File: LICENSE
@@ -38,5 +40,3 @@ Project-URL: Bug Tracker, https://github.com/actris-cloudnet/doppy/issues
 
 # Doppy - Wind doppler lidar processing
 
-
-

{doppy-0.0.1 → doppy-0.0.3}/README.md

@@ -1,3 +1 @@
 # Doppy - Wind doppler lidar processing
-
-

{doppy-0.0.1 → doppy-0.0.3}/crates/doppy_rs/Cargo.toml

@@ -1,15 +1,3 @@
-[package]
-name = "doppy_rs"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license-file = { workspace = true }
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[lib]
-name = "doppy_rs"
-crate-type = ["cdylib"]
-
 [dependencies]
 numpy = "0.20"
 doprs = {path = "../doprs"}
@@ -17,3 +5,15 @@ doprs = {path = "../doprs"}
 [dependencies.pyo3]
 version = "0.20.0"
 features = ["abi3-py310"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "doppy_rs"
+crate-type = ["cdylib"]
+
+[package]
+name = "doppy_rs"
+version = {workspace = true}
+authors = {workspace = true}
+edition = {workspace = true}
+license-file = {workspace = true}

doppy-0.0.3/crates/doprs/Cargo.toml

@@ -0,0 +1,11 @@
+[dependencies]
+chrono = "0.4"
+regex = "1.10"
+rayon = "1.8"
+
+[package]
+name = "doprs"
+version = {workspace = true}
+authors = {workspace = true}
+edition = {workspace = true}
+license-file = {workspace = true}

{doppy-0.0.1 → doppy-0.0.3}/pyproject.toml

@@ -6,10 +6,10 @@ build-backend = "maturin"
 name = "doppy"
 description = "Doppler lidar processing"
 dynamic = ["version"]
-authors = [{ name = "Niko Leskinen", email = "niko.leskinen@fmi.fi" }]
+authors = [{name = "Niko Leskinen", email = "niko.leskinen@fmi.fi"}]
 requires-python = ">=3.10"
 readme = "README.md"
-license = { file = "LICENSE" }
+license = {file = "LICENSE"}
 classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python :: 3",
@@ -18,7 +18,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "License :: OSI Approved :: MIT License",
   "Intended Audience :: Science/Research",
-  "Operating System :: OS Independent",
+  "Operating System :: OS Independent"
 ]
 dependencies = [
   "requests",
@@ -28,11 +28,11 @@ dependencies = [
   "typer[all]",
   "matplotlib",
   "scikit-learn",
-  "scipy",
+  "scipy"
 ]
 
 [project.optional-dependencies]
-dev = ["mypy", "ruff", "pytest", "types-requests", "py-spy", "maturin"]
+dev = ["mypy", "ruff", "pytest", "types-requests", "py-spy", "maturin", "release-version", "pre-commit"]
 
 [project.scripts]
 doppy = "doppy.__main__:app"
@@ -52,6 +52,7 @@ python-source = "src/"
 [tool.mypy]
 strict = true
 plugins = "numpy.typing.mypy_plugin"
+exclude = 'tests/'
 
 [[tool.mypy.overrides]]
 module = "scipy.*"
@@ -77,6 +78,14 @@ ignore_errors = true
 module = "doppy.bench.*"
 ignore_errors = true
 
+[tool.pytest.ini_options]
+markers = ["slow"]
+addopts = "-k 'not slow'"
+
+[tool.release-version]
+filename = "Cargo.toml"
+pattern = "version = \"(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)\""
+
 [tool.ruff]
 line-length = 88
 
@@ -96,7 +105,3 @@ select = [
   # isort
   "I001"
 ]
-
-[tool.pytest.ini_options]
-markers = ["slow"]
-addopts = "-k 'not slow'"

{doppy-0.0.1 → doppy-0.0.3}/src/doppy/defaults.py

@@ -1,3 +1,2 @@
 class Halo:
     wavelength = 1.565e-6
-

{doppy-0.0.1 → doppy-0.0.3}/src/doppy/product/stare.py

@@ -507,8 +507,38 @@ def _select_raws_for_stare(
     if len(raws) == 0:
         raise doppy.exceptions.NoDataError("No data to select from")
 
-    # Select files that stare vertically
-    raws_stare = [raw for raw in raws if raw.elevation_angles == {90}]
+    # Select files that stare
+    raws_stare = [
+        raw
+        for raw in raws
+        if len(raw.azimuth_angles) == 1 or raw.azimuth_angles == {0, 360}
+    ]
+    if len(raws_stare) == 0:
+        raise doppy.exceptions.NoDataError(
+            "No data suitable for stare product. Data is probably from scans"
+        )
+    raws_stare = [raw for raw in raws if len(raw.elevation_angles) == 1]
+    if len(raws_stare) == 0:
+        raise doppy.exceptions.NoDataError(
+            "No data suitable for stare product. "
+            "Elevation angle does not remain constant"
+        )
+    elevation_angles = []
+    for raw in raws_stare:
+        elevation_angles += list(raw.elevation_angles)
+    max_elevation_angle = max(elevation_angles)
+
+    ELEVATION_ANGLE_FLUCTUATION_THRESHOLD = 2
+    ELEVATION_ANGLE_VERTICAL_OFFSET_THRESHOLD = 15
+
+    raws_stare = [
+        raw
+        for raw in raws
+        if abs(next(iter(raw.elevation_angles)) - max_elevation_angle)
+        < ELEVATION_ANGLE_FLUCTUATION_THRESHOLD
+        and abs(next(iter(raw.elevation_angles)) - 90)
+        < ELEVATION_ANGLE_VERTICAL_OFFSET_THRESHOLD
+    ]
 
     if len(raws_stare) == 0:
         raise doppy.exceptions.NoDataError("No data suitable for stare product")
@@ -554,6 +584,8 @@ def _cluster_background_profiles(
     background_signal: npt.NDArray[np.float64], radial_distance: npt.NDArray[np.float64]
 ) -> npt.NDArray[np.int64]:
     default_labels = np.zeros(len(background_signal), dtype=int)
+    if len(background_signal) < 2:
+        return default_labels
     radial_distance_mask = (90 < radial_distance) & (radial_distance < 1500)
 
     normalised_background_signal = background_signal / np.median(

{doppy-0.0.1 → doppy-0.0.3}/src/doppy/raw/halo_hpl.py

@@ -20,7 +20,6 @@ from doppy import exceptions
 T = TypeVar("T")
 
 
-
 @dataclass
 class HaloHpl:
     header: HaloHplHeader
@@ -179,7 +178,7 @@ class HaloHpl:
     def non_strictly_increasing_timesteps_removed(self) -> HaloHpl:
         if len(self.time) == 0:
             return self
-        mask = np.ones_like(self.time,dtype=np.bool_)
+        mask = np.ones_like(self.time, dtype=np.bool_)
         latest_time = self.time[0]
         for i, t in enumerate(self.time[1:], start=1):
             if t <= latest_time:
@@ -364,8 +363,7 @@ def _convert_time(
     HOURS_TO_MICROSECONDS = 3600000000.0
     start_of_day = datetime64(start_time, "D").astype("datetime64[us]")
     delta_hours = (decimal_time * HOURS_TO_MICROSECONDS).astype("timedelta64[us]")
-    return np.array(start_of_day + delta_hours,dtype=datetime64)
-
+    return np.array(start_of_day + delta_hours, dtype=datetime64)
 
 
 def _parser_start_time(s: bytes) -> datetime64:

doppy-0.0.1/crates/doprs/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "doprs"
-version = { workspace = true }
-authors = { workspace = true }
-edition = { workspace = true }
-license-file = { workspace = true }
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-chrono = "0.4"
-regex = "1.10"
-rayon = "1.8"

{doppy-0.0.1 → doppy-0.0.3}/crates/doprs/src/raw.rs

@@ -1,2 +1,2 @@
-pub mod halo_hpl;
 pub mod error;
+pub mod halo_hpl;