thuban 0.0.4__tar.gz → 0.0.5__tar.gz

{thuban-0.0.4 → thuban-0.0.5}/.pre-commit-config.yaml

@@ -3,19 +3,19 @@ repos:
   # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.1
+    rev: v0.7.3
     hooks:
       # Run the linter.
       - id: ruff
         types_or: [ python, pyi ]
         args: [ --fix ]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.0
+    rev: 5.13.2
     hooks:
       - id: isort
         exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*|sunpy/extern)$"
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-ast
       - id: check-case-conflict

{thuban-0.0.4/thuban.egg-info → thuban-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thuban
-Version: 0.0.4
+Version: 0.0.5
 Summary: High precision and accuracy astrometric image solving from a guess
 Author-email: "J. Marcus Hughes" <hughes.jmb@gmail.com>
 Maintainer-email: "J. Marcus Hughes" <hughes.jmb@gmail.com>
@@ -38,6 +38,7 @@ Requires-Dist: sphinx-automodapi; extra == "docs"
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: sphinx-favicon; extra == "docs"
 Requires-Dist: ipython; extra == "docs"
+Requires-Dist: packaging; extra == "docs"
 
 # thuban
 

{thuban-0.0.4 → thuban-0.0.5}/docs/conf.py

@@ -2,6 +2,9 @@
 #
 # For the full list of built-in configuration values, see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
+from importlib.metadata import version as get_version
+
+from packaging.version import Version
 
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
@@ -9,7 +12,12 @@
 project = "thuban"
 copyright = "2024, PUNCH Science Operations Center"
 author = "PUNCH Science Operations Center"
-release = "0.0.3"
+
+release: str = get_version("thuban")
+version: str = release
+_version = Version(release)
+if _version.is_devrelease:
+    version = release = f"{_version.base_version}.dev{_version.dev}"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

{thuban-0.0.4 → thuban-0.0.5}/pyproject.toml

@@ -35,7 +35,7 @@ classifiers = [
 
 [project.optional-dependencies]
 test = ["pytest", "pytest-doctestplus", "pytest-cov", "ruff", "coverage"]
-docs = ["sphinx", "sphinx-autoapi", "sphinx-automodapi", "pydata-sphinx-theme", "sphinx-favicon", "ipython"]
+docs = ["sphinx", "sphinx-autoapi", "sphinx-automodapi", "pydata-sphinx-theme", "sphinx-favicon", "ipython", "packaging"]
 
 [project.scripts]
 thuban = "thuban.cli:determine_pointing_and_distortion"

{thuban-0.0.4 → thuban-0.0.5}/thuban/pointing.py

@@ -1,11 +1,11 @@
 import warnings
 from typing import Callable
 
+import astropy.units as u
 import numpy as np
 import pandas as pd
 import sep_pjw as sep
 from astropy.wcs import WCS, utils
-import astropy.units as u
 from lmfit import Parameters, minimize
 
 from thuban.catalog import (filter_for_visible_stars, find_catalog_in_image,
@@ -63,6 +63,7 @@ def _residual(params: Parameters,
               image_shape: (int, int),
               edge: int = 100,
               sigma: float = 3.0,
+              max_error: float = 15,
               mask: Callable = None):
     """Residual used when optimizing the pointing
 
@@ -111,20 +112,23 @@ def _residual(params: Parameters,
     out = np.array([np.min(np.linalg.norm(observed_coords - coord, axis=-1)) for coord in refined_coords[:n]])
     median, stdev = np.median(out), np.std(out)
     out[out > median + (sigma * stdev)] = 0.0  # TODO: should this be zero?
+    out[out > max_error] = 0.0  # TODO: should this be zero?
     return out
 
 
 def refine_pointing_wrapper(image, guess_wcs, file_num, observed_coords=None, catalog=None,
                     background_width=16, background_height=16,
                     detection_threshold=5, num_stars=30, max_trials=15, chisqr_threshold=0.1,
-                    dimmest_magnitude=6.0, method='leastsq'):
+                    dimmest_magnitude=6.0, method='leastsq', ra_tolerance=10, dec_tolerance=5, max_error=15):
     new_wcs, observed_coords, solution, trial_num = refine_pointing(image,
                                                                     guess_wcs,
                                                                     observed_coords=observed_coords, catalog=catalog,
                     background_width=background_width, background_height=background_height,
                     detection_threshold=detection_threshold, num_stars=num_stars, max_trials=max_trials,
                             chisqr_threshold=chisqr_threshold,
-                    dimmest_magnitude=dimmest_magnitude, method=method)
+                    dimmest_magnitude=dimmest_magnitude, method=method,
+                                                                    ra_tolerance=ra_tolerance,
+                                                                    dec_tolerance=dec_tolerance, max_error=max_error)
     return new_wcs, observed_coords, solution, trial_num, file_num
 
 
@@ -137,7 +141,8 @@ def extract_crota_from_wcs(wcs: WCS) -> tuple[float, float]:
 def refine_pointing(image, guess_wcs, observed_coords=None, catalog=None,
                     background_width=16, background_height=16,
                     detection_threshold=5, num_stars=30, max_trials=15, chisqr_threshold=0.1,
-                    dimmest_magnitude=6.0, method='leastsq', edge=100, sigma=3.0, mask=None):
+                    dimmest_magnitude=6.0, method='leastsq', edge=100, sigma=3.0, mask=None,
+                    ra_tolerance=10, dec_tolerance=5, max_error=15):
     """ Refine the pointing for an image
 
     Parameters
@@ -172,21 +177,40 @@ def refine_pointing(image, guess_wcs, observed_coords=None, catalog=None,
         observed_coords = np.stack([objects["x"], objects["y"]], axis=-1)
         if mask is not None:
             observed_coords = observed_coords[mask(objects['x'], objects['y'])]
+
+        image_shape = image.shape
+        reduced_catalog = find_catalog_in_image(catalog, guess_wcs, image_shape=image_shape, mask=mask)
+        refined_coords = np.stack([reduced_catalog['x_pix'], reduced_catalog['y_pix']], axis=-1)
+        # print("catalog found", len(refined_coords), refined_coords)
+
+        image_bounds = (image_shape[0] - edge, image_shape[1] - edge)
+        refined_coords = np.array([c for c in refined_coords
+                                   if (c[0] > edge) and (c[1] > edge) and (c[0] < image_bounds[0]) and (
+                                               c[1] < image_bounds[1])])
+
+        distances = np.array([np.min(np.linalg.norm(refined_coords - coord, axis=-1)) for coord in observed_coords])
+        observed_coords = observed_coords[distances < max_error]
         observed_coords = observed_coords[-3*num_stars:]
     # set up the optimization
     params = Parameters()
     initial_crota = extract_crota_from_wcs(guess_wcs)
     params.add("crota", value=initial_crota.to(u.rad).value, min=-np.pi, max=np.pi)
-    params.add("crval1", value=guess_wcs.wcs.crval[0], min=-180, max=180, vary=True)
-    params.add("crval2", value=guess_wcs.wcs.crval[1], min=-90, max=90, vary=True)
-
+    params.add("crval1", value=guess_wcs.wcs.crval[0],
+               min=guess_wcs.wcs.crval[0]-ra_tolerance,
+               max=guess_wcs.wcs.crval[0]+ra_tolerance, vary=True)
+    params.add("crval2", value=guess_wcs.wcs.crval[1],
+               min=guess_wcs.wcs.crval[1]-dec_tolerance,
+               max=guess_wcs.wcs.crval[1]+dec_tolerance, vary=True)
+
+    # return guess_wcs, observed_coords, None, None
     # optimize
     trial_num = 0
     result_wcses, result_minimizations = [], []
     while trial_num < max_trials:
         try:
             out = minimize(_residual, params, method=method,
-                           args=(observed_coords, catalog, guess_wcs, num_stars, image.shape, edge, sigma, mask))
+                           args=(observed_coords, catalog, guess_wcs,
+                                 num_stars, image.shape, edge, sigma, max_error, mask))
             chisqr = out.chisqr
             result_minimizations.append(out)
         except IndexError:

{thuban-0.0.4 → thuban-0.0.5/thuban.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thuban
-Version: 0.0.4
+Version: 0.0.5
 Summary: High precision and accuracy astrometric image solving from a guess
 Author-email: "J. Marcus Hughes" <hughes.jmb@gmail.com>
 Maintainer-email: "J. Marcus Hughes" <hughes.jmb@gmail.com>
@@ -38,6 +38,7 @@ Requires-Dist: sphinx-automodapi; extra == "docs"
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
 Requires-Dist: sphinx-favicon; extra == "docs"
 Requires-Dist: ipython; extra == "docs"
+Requires-Dist: packaging; extra == "docs"
 
 # thuban
 

{thuban-0.0.4 → thuban-0.0.5}/thuban.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ codecov.yaml
 pyproject.toml
 .github/workflows/ci.yaml
 .github/workflows/ci_fixed.yaml
-.github/workflows/docs.yaml
 .github/workflows/publish.yaml
 docs/Makefile
 docs/conf.py

{thuban-0.0.4 → thuban-0.0.5}/thuban.egg-info/requires.txt

@@ -16,6 +16,7 @@ sphinx-automodapi
 pydata-sphinx-theme
 sphinx-favicon
 ipython
+packaging
 
 [test]
 pytest

thuban-0.0.4/.github/workflows/docs.yaml

@@ -1,36 +0,0 @@
-name: deploy-docs
-
-# Only run this when the master branch changes
-on:
-  push:
-    branches:
-    - main
-
-# This job installs dependencies, builds the book, and pushes it to `gh-pages`
-jobs:
-  deploy-docs:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    # Install dependencies
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: |
-        pip install ".[docs]"
-
-    # Build the book
-    - name: Sphinx build
-      run: |
-        cd ./docs; make html; cd ..
-
-    # Push the book's HTML to github-pages
-    - name: GitHub Pages action
-      uses: peaceiris/actions-gh-pages@v3.6.1
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./docs/_build/html