ruststartracker 0.2.2__tar.gz → 0.2.4__tar.gz

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ruststartracker
-Version: 0.2.2
+Version: 0.2.4
 Summary: Lightweight Python Star Tracker With Rust Backend
 License: MIT
 Author: Nicolas Tobler
@@ -34,6 +34,35 @@ Features:
 
 ## Example
 
+### Rust
+
+See [examples/basic.rs](examples/basic.rs)
+
+```rust
+// Get catalog positions
+let catalog: StarCatalog = StarCatalog::from_gaia(max_magnitude: ...).unwrap();
+let stars_xyz: Vec<[f32; 3]> = catalog.normalized_positions(epoch: ..., observer_position: ...);
+let stars_mag: Vec<f32> = catalog.magnitudes();
+
+// Create StarTracker instance (reuse this)
+let star_matcher = StarMatcher::new(
+    stars_xyz,
+    stars_mag,
+    max_lookup_magnitude: ...
+    max_inter_star_angle: ...,
+    inter_star_angle_tolerance: ...,
+    min_matches: ...,
+    timeout: ...
+);
+
+// Normalized observation in the camera frame
+let obs_xyz_camera: Vec<[f32; 3]> = ...
+
+let result = star_matcher.find(&obs_xyz_camera);
+println!("Result: {:?}", result);
+```
+
+### Python
 ```python
 import ruststartracker
 
@@ -72,11 +101,6 @@ print(result)
 
 - Install with `pip install ruststartracker` (Currently only ARM/x86 Linux wheels available).
 
-## TODOs
-
-- Improve error messages.
-- Return more diagnostic data.
-
 ## Attributions
 
 ### Gaia Data
@@ -89,3 +113,14 @@ Gaia DR3 data is © European Space Agency and is released under the [**Creative
 > Gaia Collaboration, Vallenari et al. (2022), *A\&A* **674**, A1.
 > [DOI: 10.1051/0004-6361/202243940](https://doi.org/10.1051/0004-6361/202243940)
 
+### Hipparcos and Tycho Data
+
+This project includes data from the European Space Agency (ESA) mission **Hipparcos**.
+
+The Hipparcos and Tycho Catalogues were processed by the Hipparcos and Tycho Data Analysis Consortium.
+
+The Hipparcos and Tycho Catalogues are © European Space Agency and are released under the [**Creative Commons Attribution 3.0 IGO (CC BY 3.0 IGO)**](https://creativecommons.org/licenses/by/3.0/igo/) license.
+
+> Perryman, M. A. C., et al. (1997), *Astronomy & Astrophysics* **323**, L49-L52.
+1997A&A...323L..49P
+

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/README.md

@@ -13,6 +13,35 @@ Features:
 
 ## Example
 
+### Rust
+
+See [examples/basic.rs](examples/basic.rs)
+
+```rust
+// Get catalog positions
+let catalog: StarCatalog = StarCatalog::from_gaia(max_magnitude: ...).unwrap();
+let stars_xyz: Vec<[f32; 3]> = catalog.normalized_positions(epoch: ..., observer_position: ...);
+let stars_mag: Vec<f32> = catalog.magnitudes();
+
+// Create StarTracker instance (reuse this)
+let star_matcher = StarMatcher::new(
+    stars_xyz,
+    stars_mag,
+    max_lookup_magnitude: ...
+    max_inter_star_angle: ...,
+    inter_star_angle_tolerance: ...,
+    min_matches: ...,
+    timeout: ...
+);
+
+// Normalized observation in the camera frame
+let obs_xyz_camera: Vec<[f32; 3]> = ...
+
+let result = star_matcher.find(&obs_xyz_camera);
+println!("Result: {:?}", result);
+```
+
+### Python
 ```python
 import ruststartracker
 
@@ -51,11 +80,6 @@ print(result)
 
 - Install with `pip install ruststartracker` (Currently only ARM/x86 Linux wheels available).
 
-## TODOs
-
-- Improve error messages.
-- Return more diagnostic data.
-
 ## Attributions
 
 ### Gaia Data
@@ -67,3 +91,14 @@ Gaia DR3 data is © European Space Agency and is released under the [**Creative
 
 > Gaia Collaboration, Vallenari et al. (2022), *A\&A* **674**, A1.
 > [DOI: 10.1051/0004-6361/202243940](https://doi.org/10.1051/0004-6361/202243940)
+
+### Hipparcos and Tycho Data
+
+This project includes data from the European Space Agency (ESA) mission **Hipparcos**.
+
+The Hipparcos and Tycho Catalogues were processed by the Hipparcos and Tycho Data Analysis Consortium.
+
+The Hipparcos and Tycho Catalogues are © European Space Agency and are released under the [**Creative Commons Attribution 3.0 IGO (CC BY 3.0 IGO)**](https://creativecommons.org/licenses/by/3.0/igo/) license.
+
+> Perryman, M. A. C., et al. (1997), *Astronomy & Astrophysics* **323**, L49-L52.
+1997A&A...323L..49P

ruststartracker-0.2.4/build_script.py

@@ -0,0 +1,126 @@
+"""Build rust backend.
+
+This script is automatically run when the pyproject is installed.
+"""
+
+import csv
+import io
+import pathlib
+import shutil
+import subprocess
+
+
+def download_gaia_data(output_file: pathlib.Path) -> None:
+    """Download Gaia data and save it to the specified output file.
+
+    Args:
+        output_file: Path to save the downloaded Gaia data (csv).
+    """
+    from astroquery.gaia import Gaia
+
+    Gaia.ROW_LIMIT = -1
+
+    query = """
+    SELECT source_id, ra, dec, parallax, pmra, pmdec, phot_g_mean_mag
+    FROM gaiadr3.gaia_source
+    WHERE phot_g_mean_mag < 7
+        AND parallax > 0
+        AND astrometric_params_solved = 31
+        AND visibility_periods_used >= 8
+    """
+
+    print("Executing query on Gaia database...")
+    job = Gaia.launch_job_async(
+        query,
+        dump_to_file=True,
+        output_format="csv",
+        output_file=str(output_file.absolute()),
+        verbose=True,
+    )
+    if not job.is_finished():
+        print("Job did not finish successfully.")
+        return
+
+    print(f"Saved to: {output_file}")
+
+
+def download_hipparcos_data(output_file: pathlib.Path) -> None:
+    """Download Hipparcos data and save it to the specified output file.
+
+    Args:
+        output_file: Path to save the downloaded Hipparcos data (csv).
+    """
+    from astroquery.vizier import Vizier
+
+    Vizier.ROW_LIMIT = -1
+
+    print("Executing query on Hipparcos database...")
+    query = Vizier.query_constraints(
+        catalog=["I/311/hip2"],
+        Hpmag="<7",
+    )
+
+    if not query:
+        print("Job did not finish successfully.")
+        return
+
+    # Initialize a string buffer to write the CSV data to
+    csv_output = io.StringIO()
+    writer = csv.writer(csv_output)
+
+    # Write the header row
+    # Use column names that are common in Gaia and Hipparcos
+    header = ["source_id", "ra", "dec", "parallax", "pmra", "pmdec", "phot_g_mean_mag"]
+    writer.writerow(header)
+
+    # Iterate over the rows of the Astropy table
+    for row in query[0]:
+        # Extract the required data points
+        source_id = row["HIP"]
+        ra = row["RArad"]
+        dec = row["DErad"]
+        parallax = row["Plx"]
+        pmra = row["pmRA"]
+        pmdec = row["pmDE"]
+        # Use Vmag as the proxy for phot_g_mean_mag
+        phot_g_mean_mag = row["Hpmag"]
+
+        # Create a list for the new row and write it to the CSV writer
+        new_row = [source_id, ra, dec, parallax, pmra, pmdec, phot_g_mean_mag]
+        writer.writerow(new_row)
+
+    # Get the complete CSV string from the buffer
+    csv_string = csv_output.getvalue()
+
+    # You can save this string to a file
+    with output_file.open("w") as f:
+        f.write(csv_string)
+
+    print(f"Saved to: {output_file}")
+
+
+def build_script() -> None:
+    """Build rust backend and move shared library to correct folder."""
+    cwd = pathlib.Path(__file__).parent.expanduser().absolute()
+
+    gaia_file = cwd / "ruststartracker/gaia_data_j2016.csv"
+    if not gaia_file.exists():
+        download_gaia_data(gaia_file)
+
+    hipparcos_file = cwd / "ruststartracker/hipparcos_data_j1991.25.csv"
+    if not hipparcos_file.exists():
+        download_hipparcos_data(hipparcos_file)
+
+    subprocess.check_call(  # noqa: S603
+        ["cargo", "build", "--release", "--features", "improc,gaia,hipparcos"],  # noqa: S607
+        cwd=cwd,
+        stdout=None,
+        stderr=None,
+    )
+    shutil.copy(
+        cwd / "target/release/libruststartracker.so", cwd / "ruststartracker/libruststartracker.so"
+    )
+
+
+if __name__ == "__main__":
+    build_script()

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/pyproject.toml

@@ -1,12 +1,13 @@
 [tool.poetry]
 name = "ruststartracker"
-version = "0.2.2"
+version = "0.2.4"
 description = "Lightweight Python Star Tracker With Rust Backend"
 authors = ["Nicolas Tobler <nitobler@gmail.com>"]
 readme = "README.md"
 license = "MIT"
 include = [
     { path = "ruststartracker/gaia_data_j2016.csv", format = ["sdist", "wheel"] },
+    { path = "ruststartracker/hipparcos_data_j1991.25.csv", format = ["sdist", "wheel"] },
     { path = "ruststartracker/libruststartracker.so", format = ["wheel"] },
 ]
 
@@ -33,6 +34,7 @@ scipy-stubs = "^1.14.1.5"
 ruff = "^0.9.3"
 bump-my-version = "^1.2.0"
 astroquery = "^0.4.10"
+typing-extensions = "^4.12.2"
 
 [tool.poetry.build]
 script = "build_script.py"
@@ -42,7 +44,7 @@ requires = ["poetry-core", "astroquery>=0.4.10"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.bumpversion]
-current_version = "0.2.2"
+current_version = "0.2.4"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/catalog.py

@@ -7,14 +7,17 @@ import pathlib
 
 import numpy as np
 import numpy.typing as npt
+from typing_extensions import Self
 
 AU: float = 149597870.693
 """Astronomical unit."""
 
-INTERNAL_CATALOG_FILE = (
-    pathlib.Path(__file__).parent.expanduser().absolute() / "gaia_data_j2016.csv"
+GAIA_CATALOG_FILE = pathlib.Path(__file__).parent.expanduser().absolute() / "gaia_data_j2016.csv"
+"""Location of the internal Gaia star catalog file."""
+HIPPARCOS_CATALOG_FILE = (
+    pathlib.Path(__file__).parent.expanduser().absolute() / "hipparcos_data_j1991.25.csv"
 )
-"""Location of the internal star catalog file."""
+"""Location of the internal Hipparcos star catalog file."""
 
 
 def time_to_epoch(t: datetime.datetime) -> float:
@@ -44,24 +47,41 @@ class StarCatalog:
     """Proper motion of the declination in mad."""
     magnitude: npt.NDArray[np.float32]
     """Magnitude values."""
-    epoch: float = 2016.0
+    epoch: float
     """Epoch of the catalog in years."""
 
+    @classmethod
+    def from_gaia(cls, *, max_magnitude: float = 6.0) -> Self:
+        """Read internally provided Gaia catalog file.
+
+        Args:
+            max_magnitude: Maximum magnitude to include.
+        """
+        return cls(GAIA_CATALOG_FILE, epoch=2016.0, max_magnitude=max_magnitude)
+
+    @classmethod
+    def from_hipparcos(cls, *, max_magnitude: float = 6.0) -> Self:
+        """Read internally provided Hipparcos catalog file.
+
+        Args:
+            max_magnitude: Maximum magnitude to include.
+        """
+        return cls(HIPPARCOS_CATALOG_FILE, epoch=1991.25, max_magnitude=max_magnitude)
+
     def __init__(
-        self, filename: pathlib.Path | str | None = None, max_magnitude: float = 6.0
+        self, filename: pathlib.Path | str, *, epoch: float, max_magnitude: float = 6.0
     ) -> None:
         """Read catalog from file.
 
         Args:
             filename: Star catalog filename.
+            epoch: Epoch of the catalog in years.
             max_magnitude: Maximum magnitude to include.
         """
-        # Use locally included star catalog is no file is given
-        filename = INTERNAL_CATALOG_FILE if filename is None else pathlib.Path(filename)
-
+        self.epoch = epoch
         keep_columns = ("ra", "dec", "parallax", "pmra", "pmdec", "phot_g_mean_mag")
 
-        with filename.open("r") as f:
+        with pathlib.Path(filename).open("r") as f:
             it = csv.reader(f, delimiter=",", strict=True)
 
             # Get columns

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/libruststartracker.pyi

@@ -2,12 +2,15 @@ from collections.abc import Iterator
 
 import numpy as np
 import numpy.typing as npt
+from typing_extensions import Self
 
 class StarMatcher:
     def __init__(
         self,
         stars_xyz: npt.NDArray[np.float32],
+        stars_mag: npt.NDArray[np.float32],
         max_inter_star_angle: float,
+        max_lookup_magnitude: float,
         inter_star_angle_tolerance: float,
         n_minimum_matches: int,
         timeout_secs: float,
@@ -19,7 +22,7 @@ class StarMatcher:
         npt.NDArray[np.uint32],
         npt.NDArray[np.uint32],
         int,
-        list[list[float]],
+        npt.NDArray[np.float32],
         float,
     ]: ...
 
@@ -44,15 +47,45 @@ class IterTriangleFinder:
 class UnitVectorLookup:
     def __init__(self, vec: npt.NDArray[np.float32]) -> None: ...
     def lookup_nearest(self, key: npt.NDArray[np.float32]) -> int: ...
-    def get_inter_star_index_numpy(
-        self, vec: npt.NDArray[np.float32], angle_threshold: float
-    ) -> tuple[list[list[int]], list[float], list[float]]: ...
     def get_inter_star_index(
-        self, vec: npt.NDArray[np.float32], angle_threshold: float
+        self,
+        stars: npt.NDArray[np.float32],
+        magnitudes: npt.NDArray[np.float32],
+        max_angle_rad: float,
+        max_magnitude: float,
     ) -> tuple[list[list[int]], list[float], list[float]]: ...
     def look_up_close_angles(
-        self, vectors: npt.NDArray[np.float32], max_angle_rad: float
+        self,
+        vectors: npt.NDArray[np.float32],
+        magnitudes: npt.NDArray[np.float32],
+        max_angle_rad: float,
+        max_magnitude: float,
     ) -> list[tuple[list[float], float]]: ...
     def look_up_close_angles_naive(
-        self, vectors: npt.NDArray[np.float32], max_angle_rad: float
+        self,
+        vectors: npt.NDArray[np.float32],
+        magnitudes: npt.NDArray[np.float32],
+        max_angle_rad: float,
+        max_magnitude: float,
     ) -> list[tuple[list[float], float]]: ...
+
+def get_threshold_from_histogram(
+    img: npt.NDArray[np.uint8],
+    *,
+    fraction: float,
+) -> int: ...
+def extract_observations(
+    img: npt.NDArray[np.uint8],
+    threshold: int,
+    min_star_area: int,
+    max_star_area: int,
+) -> tuple[npt.NDArray[np.float32], npt.NDArray[np.float32]]: ...
+
+class StarCatalog:
+    @classmethod
+    def from_gaia(cls, *, max_magnitude: float | None) -> Self: ...
+    @classmethod
+    def from_hipparcos(cls, *, max_magnitude: float | None) -> Self: ...
+    def normalized_positions(
+        self, *, epoch: float | None, observer_position: np.ndarray | None
+    ) -> npt.NDArray[np.float32]: ...

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/star.py

@@ -87,8 +87,10 @@ class StarTracker:
     def __init__(
         self,
         stars_xyz: npt.NDArray[np.float32],
+        stars_mag: npt.NDArray[np.float32],
         camera_params: CameraParameters,
         *,
+        max_lookup_magnitude: float | None = None,
         max_inter_star_angle: float | None = None,
         inter_star_angle_tolerance: float = 0.0008,
         n_minimum_matches: int = 10,
@@ -98,11 +100,15 @@ class StarTracker:
 
         Args:
             stars_xyz: Positions of catalog stars
+            stars_mag: Magnitudes of catalog stars
             camera_params: Calibrated camera parameters
+            max_lookup_magnitude: Maximum magnitude of stars used in the triangulation. Reducing
+                this number means only bright stars are used for triangulation. This results in
+                faster lookup performance.
             max_inter_star_angle: Maximum angle between stars that should be indexed.
                 Calculating large inter star angles is expensive. If None, the angle is
                 calculated from the camera field of view.
-            inter_star_angle_tolerance: Tolerance for inter star angle matching.
+            inter_star_angle_tolerance: Tolerance for inter star angle matching in rad.
             n_minimum_matches: Minimum amount of required matches for a successful
                 attitude estimation
             timeout_secs: Maximum allowed search time in seconds. A StarTrackerError is raised
@@ -127,8 +133,13 @@ class StarTracker:
             dot_products = (corner_coords_xyz * np.array([0, 0, 1], dtype=np.float32)).sum(axis=-1)
             max_inter_star_angle = float(np.arccos(dot_products.max())) * 2
 
+        if max_lookup_magnitude is None:
+            max_lookup_magnitude = 100.0  # A very faint star. Almost infinity
+
         self._star_matcher = ruststartracker.libruststartracker.StarMatcher(
             np.ascontiguousarray(stars_xyz, dtype=np.float32),
+            np.ascontiguousarray(stars_mag, dtype=np.float32),
+            float(max_lookup_magnitude),
             float(max_inter_star_angle),
             float(inter_star_angle_tolerance),
             int(n_minimum_matches),
@@ -178,6 +189,20 @@ class StarTracker:
             max_star_area=max_star_area,
         )
 
+        if threshold is None:
+            threshold = ruststartracker.libruststartracker.get_threshold_from_histogram(
+                img, fraction=0.99
+            )
+
+        centroids, intensities = ruststartracker.libruststartracker.extract_observations(
+            img,
+            threshold,
+            min_star_area,
+            max_star_area,
+        )
+        centroids = np.array(centroids, dtype=np.float32)
+        intensities = np.array(intensities, dtype=np.float32)
+
         # At least 3 observations are required (one triangle)
         if len(centroids) < 3:
             raise StarTrackerError("Found too few star candidates (< 3) to continue.")
@@ -238,12 +263,12 @@ class StarTracker:
         quat, match_ids, obs_indices, n_matches, matched_obs, duration_s = result
 
         return StarTrackerResult(
-            quat=np.asarray(quat, dtype=np.float32),
-            match_ids=np.asarray(match_ids, dtype=np.uint32),
+            quat=quat,
+            match_ids=match_ids,
             n_matches=n_matches,
             duration_s=duration_s,
-            mached_obs_x=np.asarray(matched_obs, dtype=np.float32),
-            obs_indices=np.asarray(obs_indices, dtype=np.uint32),
+            mached_obs_x=matched_obs,
+            obs_indices=obs_indices,
         )
 
 

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/test_backend.py

@@ -54,9 +54,12 @@ def test_unit_vector_lookup():
     close_indices_gt = np.concatenate(results, axis=-1).T[args]
     angles_gt = angles[args]
 
-    close_indices, angles, poly = uvl.get_inter_star_index_numpy(vec, angle_threshold)
-
-    close_indices, angles, poly = uvl.get_inter_star_index(vec[:, :3], angle_threshold)
+    close_indices, angles, poly = uvl.get_inter_star_index(
+        np.array(vec[:, :3], dtype=np.float32),
+        np.ones(len(vec), dtype=np.float32),
+        angle_threshold,
+        10,
+    )
     close_indices = np.array(close_indices)
     angles = np.array(angles)
     poly = np.array(poly)
@@ -101,6 +104,8 @@ def test_star_matcher():
     vec = rng.normal(size=[n_cat_stars, 3]).astype(np.float32)
     vec /= np.linalg.norm(vec, axis=-1, keepdims=True)
 
+    magnitudes = rng.uniform(0, 10, size=vec.shape[:1]).astype(np.float32)
+
     key = rng.normal(size=[3]).astype(np.float32)
     key /= np.linalg.norm(key, axis=-1, keepdims=True)
 
@@ -113,10 +118,16 @@ def test_star_matcher():
 
     rot = scipy.spatial.transform.Rotation.from_rotvec([1, 1, 1])
 
-    obs_rotated = rot.apply(obs)
+    obs_rotated = rot.apply(obs).astype(np.float32)
 
     index = libruststartracker.StarMatcher(
-        vec, np.radians(10).item(), np.radians(0.1).item(), 4, 999.0
+        vec,
+        magnitudes,
+        10,
+        np.radians(10).item(),
+        np.radians(0.1).item(),
+        4,
+        999.0,
     )
 
     res = index.find(obs_rotated)
@@ -124,7 +135,7 @@ def test_star_matcher():
     assert res is not None
 
     quat, match_ids, obs_indices, n_matches, matched_obs, time_s = res
-    np.testing.assert_allclose(quat, rot.inv().as_quat())
+    np.testing.assert_allclose(quat, rot.inv().as_quat(), rtol=1e-6)
     assert n_matches >= 4
     assert len(obs_index) == len(match_ids)
 

ruststartracker-0.2.4/ruststartracker/test_catalog.py

@@ -0,0 +1,101 @@
+import datetime
+import time
+
+import astropy.time  # type: ignore[import]
+import numpy as np
+import pytest
+
+import ruststartracker.catalog
+import ruststartracker.libruststartracker
+
+
+def test_time_to_epoch():
+    np.testing.assert_allclose(
+        ruststartracker.catalog.time_to_epoch(
+            datetime.datetime.fromisoformat("2000-01-01T11:58:56")
+        ),
+        2000.0,
+        rtol=1e-20,
+        atol=1 / (365 * 86400),
+    )
+
+
+@pytest.mark.parametrize(
+    "iso_date",
+    [
+        "2000-01-01T11:58:56",
+        "2024-01-01T11:58:56",
+    ],
+)
+def test_time_to_epoch_astropy(iso_date: str):
+    ground_truth = float(astropy.time.Time(iso_date).jyear)  # type: ignore
+    np.testing.assert_allclose(
+        ruststartracker.catalog.time_to_epoch(datetime.datetime.fromisoformat(iso_date)),
+        ground_truth,
+        rtol=1e-20,
+        atol=64 / (365 * 86400),
+    )
+
+
+def test_extract_observations():
+    positions = ruststartracker.catalog.StarCatalog.from_gaia().normalized_positions()
+
+    assert positions.ndim == 2
+    assert positions.shape[1] == 3
+    np.testing.assert_allclose(np.linalg.norm(positions, axis=-1), 1.0, rtol=1e-5)
+
+
+def test_gaia_python_rust():
+    t0 = time.monotonic()
+    positions = ruststartracker.catalog.StarCatalog.from_gaia().normalized_positions(epoch=2025.0)
+    print(f"Python catalog took {time.monotonic() - t0:.3f} seconds")
+    t0 = time.monotonic()
+    positions2 = ruststartracker.libruststartracker.StarCatalog.from_gaia(
+        max_magnitude=6.0
+    ).normalized_positions(epoch=2025.0, observer_position=None)
+    print(f"Rust catalog took {time.monotonic() - t0:.3f} seconds")
+    np.testing.assert_allclose(positions, positions2, rtol=1e-5, atol=1e-5)
+
+
+def test_hipparcos_python_rust():
+    t0 = time.monotonic()
+    positions = ruststartracker.catalog.StarCatalog.from_hipparcos().normalized_positions(
+        epoch=2025.0
+    )
+    print(f"Python catalog took {time.monotonic() - t0:.3f} seconds")
+    t0 = time.monotonic()
+    positions2 = ruststartracker.libruststartracker.StarCatalog.from_hipparcos(
+        max_magnitude=6.0
+    ).normalized_positions(epoch=2025.0, observer_position=None)
+    print(f"Rust catalog took {time.monotonic() - t0:.3f} seconds")
+    np.testing.assert_allclose(positions, positions2, rtol=1e-5, atol=1e-5)
+
+
+def test_compare_hipparcos_gaia():
+    def filt(cat: ruststartracker.catalog.StarCatalog, m: float = 0):
+        positions = cat.normalized_positions(epoch=2025.0)
+        mags = cat.magnitude
+        mask = (positions[..., 2] > 0.9) * (mags > 5 - m) * (mags < 8 - m)
+        return positions[mask]
+
+    positions_hipparcos = filt(ruststartracker.catalog.StarCatalog.from_hipparcos(max_magnitude=8))
+    positions_gaia = filt(ruststartracker.catalog.StarCatalog.from_gaia(max_magnitude=8), m=0.9)
+
+    dists = np.linalg.norm(
+        positions_hipparcos[np.newaxis, :, :] - positions_gaia[:, np.newaxis, :], axis=-1
+    )
+    matches = np.min(dists, axis=0) < 0.00005
+
+    assert np.mean(matches > 0.9)
+
+    if False:
+        import matplotlib.pyplot as plt
+
+        plt.plot(positions_gaia[..., 0], positions_gaia[..., 1], "+", label="gaia")
+        plt.plot(positions_hipparcos[..., 0], positions_hipparcos[..., 1], "x", label="hipparcos")
+        plt.legend()
+        plt.show()
+
+
+if __name__ == "__main__":
+    pytest.main([__file__])

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/test_integration.py

@@ -24,8 +24,9 @@ def prepare() -> tuple[ruststartracker.StarTracker, np.ndarray]:
 
     dist_coefs = np.array([-0.44120807, -0.15954202, 0.00767012, -0.00213292, -1.64788247])
 
-    catalog = ruststartracker.StarCatalog()
+    catalog = ruststartracker.StarCatalog.from_gaia()
     star_catalog_vecs = catalog.normalized_positions(epoch=2024)
+    star_catalog_magnitudes = catalog.magnitude
 
     camera_params = ruststartracker.CameraParameters(
         camera_matrix=camera_matrix,
@@ -35,6 +36,7 @@ def prepare() -> tuple[ruststartracker.StarTracker, np.ndarray]:
 
     st = ruststartracker.StarTracker(
         star_catalog_vecs,
+        star_catalog_magnitudes,
         camera_params,
         inter_star_angle_tolerance=np.radians(0.05).item(),
         n_minimum_matches=5,

{ruststartracker-0.2.2 → ruststartracker-0.2.4}/ruststartracker/test_star.py

@@ -5,16 +5,29 @@ import pytest
 import scipy.spatial
 
 import ruststartracker
+import ruststartracker.libruststartracker
 import ruststartracker.star
 
 
-def test_extract_observations():
-    size_x, size_y = (40, 50)
+@pytest.mark.parametrize("impl", ["python", "rust"])
+def test_extract_observations(impl: str):
+    size_x, size_y = (960, 480)
     img = np.zeros((size_y, size_x), np.uint8)
-    points = np.array([(3, 5), (23, 13)])
+    points = np.array([(3, 5), (23, 13), (30, 50), (230, 130)])
     for x, y in points:
         img[y - 1 : y + 3, x - 1 : x + 3] = 50
-    centers, intensities = ruststartracker.star._extract_observations(img, threshold=30)
+
+    t0 = time.monotonic()
+    if impl == "python":
+        centers, intensities = ruststartracker.star._extract_observations(img, threshold=30)
+    else:
+        centers, intensities = ruststartracker.libruststartracker.extract_observations(
+            img, 30, 3, 300
+        )
+    print(f"Extracting observations took {time.monotonic() - t0:.5f} seconds")
+
+    assert isinstance(centers, np.ndarray)
+    assert isinstance(intensities, np.ndarray)
     np.testing.assert_almost_equal(centers, points + 0.5)
     np.testing.assert_almost_equal(intensities, 50 * 16)
 
@@ -28,6 +41,8 @@ def setup():
     vec = rng.normal(size=[n_cat_stars, 3]).astype(np.float32)
     vec /= np.linalg.norm(vec, axis=-1, keepdims=True)
 
+    mag = rng.uniform(0, 10, size=vec.shape[:1]).astype(np.float32)
+
     angle_threshold = np.radians(10)
     dotp = np.sum([0, 0, 1] * vec, axis=-1)
     threshold = np.cos(angle_threshold).item()
@@ -55,17 +70,18 @@ def setup():
         image_patch = img[y - 1 : y + 2, x - 1 : x + 2]
         image_patch[:] = 50
 
-    return img, vec, camera_params
+    return img, vec, mag, pixel_in_frame, camera_params
 
 
 def test_star_matcher_success(setup):
-    img, vec, camera_params = setup
+    img, vec, mag, _, camera_params = setup
 
     rot = scipy.spatial.transform.Rotation.from_rotvec([1, 1, 1])
     vec = rot.inv().apply(vec)
 
     st = ruststartracker.StarTracker(
         vec,
+        mag,
         camera_params,
         inter_star_angle_tolerance=np.radians(0.1).item(),
         n_minimum_matches=6,
@@ -78,34 +94,51 @@ def test_star_matcher_success(setup):
 
 
 def test_star_matcher_exhaust(setup):
-    img, vec, camera_params = setup
+    img, vec, mag, _, camera_params = setup
     st = ruststartracker.StarTracker(
         vec,
+        mag,
         camera_params,
         inter_star_angle_tolerance=np.radians(0.001).item(),
         n_minimum_matches=500,
         timeout_secs=999.0,
     )
-    with pytest.raises(ruststartracker.StarTrackerError, match="exhaust"):
+    with pytest.raises(ruststartracker.StarTrackerError, match="SearchExhausted"):
         st.process_image(img)
 
 
 def test_star_matcher_timout(setup):
-    img, vec, camera_params = setup
-    timeout = 0.2
+    img, vec, mag, _, camera_params = setup
+    timeout = 0.0002
     st = ruststartracker.StarTracker(
         vec,
+        mag,
         camera_params,
         inter_star_angle_tolerance=np.radians(0.1).item(),
         n_minimum_matches=500,
         timeout_secs=timeout,
     )
     t = time.monotonic()
-    with pytest.raises(ruststartracker.StarTrackerError, match="Timeout reached"):
+    with pytest.raises(ruststartracker.StarTrackerError, match="Timeout"):
         st.process_image(img)
     passed_time = time.monotonic() - t
     assert passed_time > timeout
 
 
+def test_star_matcher_not_enough_stars(setup):
+    _, vec, mag, pixel_in_frame, camera_params = setup
+    timeout = 0.2
+    st = ruststartracker.StarTracker(
+        vec,
+        mag,
+        camera_params,
+        inter_star_angle_tolerance=np.radians(0.1).item(),
+        n_minimum_matches=500,
+        timeout_secs=timeout,
+    )
+    with pytest.raises(ruststartracker.StarTrackerError, match="NotEnoughStars"):
+        st.process_image_coordiantes(pixel_in_frame[:2])
+
+
 if __name__ == "__main__":
-    pytest.main([__file__])
+    pytest.main([__file__, "--capture=no"])

ruststartracker-0.2.2/build_script.py

@@ -1,60 +0,0 @@
-"""Build rust backend.
-
-This script is automatically run when the pyproject is installed.
-"""
-
-import pathlib
-import shutil
-import subprocess
-
-
-def download_gaia_data(output_file: pathlib.Path) -> None:
-    """Download Gaia data and save it to the specified output file.
-
-    Args:
-        output_file: Path to save the downloaded Gaia data (csv).
-    """
-    from astroquery.gaia import Gaia
-
-    Gaia.ROW_LIMIT = 10000
-
-    query = """
-    SELECT source_id, ra, dec, parallax, pmra, pmdec, phot_g_mean_mag
-    FROM gaiadr3.gaia_source
-    WHERE phot_g_mean_mag < 7
-        AND parallax > 0
-        AND astrometric_params_solved = 31
-        AND visibility_periods_used >= 8
-    """
-
-    print("Executing query on Gaia database...")
-    job = Gaia.launch_job_async(
-        query,
-        dump_to_file=True,
-        output_format="csv",
-        output_file=str(output_file.absolute()),
-        verbose=True,
-    )
-    if not job.is_finished():
-        print("Job did not finish successfully.")
-        return
-
-    print(f"Saved to: {output_file}")
-
-
-def build_script() -> None:
-    """Build rust backend and move shared library to correct folder."""
-    cwd = pathlib.Path(__file__).parent.expanduser().absolute()
-
-    gaia_file = cwd / "ruststartracker/gaia_data_j2016.csv"
-    if not gaia_file.exists():
-        download_gaia_data(gaia_file)
-
-    subprocess.check_call(["cargo", "build", "--release"], cwd=cwd)  # noqa: S603, S607
-    shutil.copy(
-        cwd / "target/release/libruststartracker.so", cwd / "ruststartracker/libruststartracker.so"
-    )
-
-
-if __name__ == "__main__":
-    build_script()

ruststartracker-0.2.2/ruststartracker/test_catalog.py

@@ -1,47 +0,0 @@
-import datetime
-
-import astropy.time  # type: ignore[import]
-import numpy as np
-import pytest
-
-import ruststartracker.catalog
-
-
-def test_time_to_epoch():
-    np.testing.assert_allclose(
-        ruststartracker.catalog.time_to_epoch(
-            datetime.datetime.fromisoformat("2000-01-01T11:58:56")
-        ),
-        2000.0,
-        rtol=1e-20,
-        atol=1 / (365 * 86400),
-    )
-
-
-@pytest.mark.parametrize(
-    "iso_date",
-    [
-        "2000-01-01T11:58:56",
-        "2024-01-01T11:58:56",
-    ],
-)
-def test_time_to_epoch_astropy(iso_date: str):
-    ground_truth = float(astropy.time.Time(iso_date).jyear)  # type: ignore
-    np.testing.assert_allclose(
-        ruststartracker.catalog.time_to_epoch(datetime.datetime.fromisoformat(iso_date)),
-        ground_truth,
-        rtol=1e-20,
-        atol=64 / (365 * 86400),
-    )
-
-
-def test_extract_observations():
-    positions = ruststartracker.catalog.StarCatalog().normalized_positions()
-
-    assert positions.ndim == 2
-    assert positions.shape[1] == 3
-    np.testing.assert_allclose(np.linalg.norm(positions, axis=-1), 1.0, rtol=1e-5)
-
-
-if __name__ == "__main__":
-    pytest.main([__file__])