thuban 0.0.2__tar.gz → 0.0.4__tar.gz

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

@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '0 0 * * MON'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install ".[test]"
+    - name: Lint with ruff
+      run: |
+        ruff check .
+    - name: Test with pytest
+      run: |
+        pip install .
+        coverage run --branch --source=thuban/ -m pytest tests -m "not slow"
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: punch-mission/thuban

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

@@ -0,0 +1,46 @@
+name: CI pinned server environment
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '0 0 * * MON'
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Grab requirements.txt
+      run: |
+        wget https://raw.githubusercontent.com/punch-mission/punch-mission/refs/heads/main/requirements.txt
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install ".[test]"
+    - name: Test with pytest
+      run: |
+        coverage run -m pytest
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v4
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        fail_ci_if_error: true
+        verbose: true

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

@@ -0,0 +1,36 @@
+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

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

@@ -0,0 +1,37 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Build package
+      run: python -m build -s
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@release/v1

thuban-0.0.4/.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/

thuban-0.0.4/.pre-commit-config.yaml

@@ -0,0 +1,31 @@
+exclude: "\\.asdf$"
+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
+    hooks:
+      # Run the linter.
+      - id: ruff
+        types_or: [ python, pyi ]
+        args: [ --fix ]
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.13.0
+    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
+    hooks:
+      - id: check-ast
+      - id: check-case-conflict
+      - id: trailing-whitespace
+        exclude: ".*(.fits|.fts|.fit|.header|.txt)$"
+      - id: check-yaml
+      - id: debug-statements
+      - id: check-added-large-files
+        args: ['--enforce-all','--maxkb=10000']
+      - id: end-of-file-fixer
+        exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|.json)$|^CITATION.rst$"
+      - id: mixed-line-ending
+        exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*)$"

thuban-0.0.4/.readthedocs.yaml

@@ -0,0 +1,33 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats:
+  - pdf
+  - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - method: pip
+      extra_requirements:
+        - all
+        - docs
+      path: .

thuban-0.0.4/CITATION.cff

@@ -0,0 +1,11 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+- family-names: "Hughes"
+  given-names: "J. Marcus"
+  orcid: "https://orcid.org/0000-0003-3410-7650"
+title: "thuban"
+version: 0.0.3
+doi: 10.5281/zenodo.13340312
+date-released: 2024-08-18
+url: "https://github.com/punch-mission/thuban"

{thuban-0.0.2 → thuban-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thuban
-Version: 0.0.2
+Version: 0.0.4
 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>

thuban-0.0.4/codecov.yaml

@@ -0,0 +1,8 @@
+coverage:
+  status:
+    patch:
+      default:
+        target: 80%
+    project:
+      default:
+        target: 95%

thuban-0.0.4/docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

thuban-0.0.4/docs/conf.py

@@ -0,0 +1,62 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Project information -----------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
+
+project = "thuban"
+copyright = "2024, PUNCH Science Operations Center"
+author = "PUNCH Science Operations Center"
+release = "0.0.3"
+
+# -- General configuration ---------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
+
+extensions = ["autoapi.extension",
+              "sphinx.ext.autodoc",
+              "sphinx.ext.napoleon",
+              "sphinx_favicon",
+              "IPython.sphinxext.ipython_console_highlighting"]
+
+templates_path = ["_templates"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+
+
+# -- Options for HTML output -------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
+
+html_theme = "pydata_sphinx_theme"
+html_show_sourcelink = False
+html_static_path = ["_static"]
+html_theme_options = {
+    "use_edit_page_button": True,
+    "icon_links": [
+        {
+            "name": "GitHub",
+            "url": "https://github.com/punch-mission/thuban",
+            "icon": "fa-brands fa-github",
+            "type": "fontawesome",
+        }
+    ],
+    "show_nav_level": 1,
+    "show_toc_level": 3,
+    "logo": {
+        "text": "thuban",
+        "image_light": "_static/logo.png",
+        "image_dark": "_static/logo.png",
+    }
+}
+html_context = {
+    # "github_url": "https://github.com", # or your GitHub Enterprise site
+    "github_user": "punch-mission",
+    "github_repo": "thuban",
+    "github_version": "main",
+    "doc_path": "docs/",
+}
+
+
+autoapi_dirs = ["../thuban"]
+
+favicons = ["favicon.ico"]

thuban-0.0.4/docs/index.rst

@@ -0,0 +1,20 @@
+.. thuban documentation master file, created by
+   sphinx-quickstart on Fri Mar 22 08:31:44 2024.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to thuban's documentation!
+==================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

thuban-0.0.4/docs/make.bat

@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=.
+set BUILDDIR=_build
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.https://www.sphinx-doc.org/
+	exit /b 1
+)
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd

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

@@ -1,11 +1,11 @@
 [build-system]
+requires = ["setuptools>=64", "setuptools-scm>=8", "wheel"]
+build-backend = "setuptools.build_meta"
 
-requires = ["setuptools",
-            "wheel"]
 
 [project]
 name = "thuban"
-version = "0.0.2"
+dynamic = ["version"]
 dependencies = ["numpy",
     "astropy",
     "matplotlib",
@@ -47,6 +47,8 @@ Repository = "https://github.com/punch-mission/thuban.git"
 "Bug Tracker" = "https://github.com/punch-mission/thuban/issues"
 Changelog = "https://github.com/punch-mission/thuban/blob/main/CHANGELOG.md"
 
+[tool.setuptools_scm]
+
 [tool.setuptools]
 packages = ["thuban"]
 

thuban-0.0.4/scripts/prepare_reduced_hip.py

@@ -0,0 +1,6 @@
+from thuban.catalog import filter_for_visible_stars, load_raw_hipparcos_catalog
+
+if __name__ == "__main__":
+    raw_hipparcos = load_raw_hipparcos_catalog()
+    reduced_hipparcos = filter_for_visible_stars(raw_hipparcos, dimmest_magnitude=14)
+    reduced_hipparcos.to_csv("../thuban/data/reduced_hip.csv", index=False)

{thuban-0.0.2 → thuban-0.0.4}/thuban/catalog.py

@@ -1,4 +1,5 @@
 import os
+from typing import Callable
 
 import astropy.units as u
 import numpy as np
@@ -163,7 +164,7 @@ def filter_for_visible_stars(catalog: pd.DataFrame, dimmest_magnitude: float = 6
 
 
 def find_catalog_in_image(
-    catalog: pd.DataFrame, wcs: WCS, image_shape: (int, int),
+    catalog: pd.DataFrame, wcs: WCS, image_shape: (int, int), mask: Callable = None,
         mode: str = "all"
 ) -> np.ndarray:
     """Using the provided WCS converts the RA/DEC catalog into pixel coordinates
@@ -195,6 +196,10 @@ def find_catalog_in_image(
     except NoConvergence as e:
         xs, ys = e.best_solution[:, 0], e.best_solution[:, 1]
     bounds_mask = (0 <= xs) * (xs < image_shape[0]) * (0 <= ys) * (ys < image_shape[1])
+
+    if mask is not None:
+        bounds_mask *= mask(xs, ys)
+
     reduced_catalog = catalog[bounds_mask].copy()
     reduced_catalog["x_pix"] = xs[bounds_mask]
     reduced_catalog['y_pix'] = ys[bounds_mask]

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

@@ -1,9 +1,11 @@
 import warnings
+from typing import Callable
 
 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,
@@ -47,19 +49,21 @@ def calculate_pc_matrix(crota: float, cdelt: (float, float)) -> np.ndarray:
     """
     return np.array(
         [
-            [np.cos(crota), np.sin(crota) * (cdelt[0] / cdelt[1])],
-            [-np.sin(crota) * (cdelt[1] / cdelt[0]), np.cos(crota)],
+            [np.cos(crota), -np.sin(crota) * (cdelt[0] / cdelt[1])],
+            [np.sin(crota) * (cdelt[1] / cdelt[0]), np.cos(crota)],
         ],
     )
 
 
-
 def _residual(params: Parameters,
               observed_coords: np.ndarray,
               catalog: pd.DataFrame,
               guess_wcs: WCS,
               n: int,
-              image_shape: (int, int)):
+              image_shape: (int, int),
+              edge: int = 100,
+              sigma: float = 3.0,
+              mask: Callable = None):
     """Residual used when optimizing the pointing
 
     Parameters
@@ -86,13 +90,13 @@ def _residual(params: Parameters,
     refined_wcs.wcs.crpix = guess_wcs.wcs.crpix
     refined_wcs.wcs.crval = (params["crval1"].value, params["crval2"].value)
     refined_wcs.wcs.pc = calculate_pc_matrix(params["crota"], refined_wcs.wcs.cdelt)
-    refined_wcs.cpdis1 = guess_wcs.cpdis1   # TODO what if there is no distortion?
+    refined_wcs.cpdis1 = guess_wcs.cpdis1
     refined_wcs.cpdis2 = guess_wcs.cpdis2
+    refined_wcs.wcs.set_pv(guess_wcs.wcs.get_pv())
 
-    reduced_catalog = find_catalog_in_image(catalog, refined_wcs, image_shape=image_shape)
+    reduced_catalog = find_catalog_in_image(catalog, refined_wcs, image_shape=image_shape, mask=mask)
     refined_coords = np.stack([reduced_catalog['x_pix'], reduced_catalog['y_pix']], axis=-1)
 
-    edge = 300
     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])])
@@ -104,10 +108,9 @@ def _residual(params: Parameters,
                       "Try decreasing `num_stars` or increasing `dimmest_magnitude`.",
                       RepeatedStarWarning)
 
-    sigma = 3
     out = np.array([np.min(np.linalg.norm(observed_coords - coord, axis=-1)) for coord in refined_coords[:n]])
-    mean, stdev = np.mean(out), np.std(out)
-    out[out > mean + sigma * stdev] = 0.0
+    median, stdev = np.median(out), np.std(out)
+    out[out > median + (sigma * stdev)] = 0.0  # TODO: should this be zero?
     return out
 
 
@@ -125,10 +128,16 @@ def refine_pointing_wrapper(image, guess_wcs, file_num, observed_coords=None, ca
     return new_wcs, observed_coords, solution, trial_num, file_num
 
 
+def extract_crota_from_wcs(wcs: WCS) -> tuple[float, float]:
+    """Extract CROTA from a WCS."""
+    delta_ratio = wcs.wcs.cdelt[1] / wcs.wcs.cdelt[0]
+    return np.arctan2(wcs.wcs.pc[1, 0]/delta_ratio, wcs.wcs.pc[0, 0]) * u.rad
+
+
 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'):
+                    dimmest_magnitude=6.0, method='leastsq', edge=100, sigma=3.0, mask=None):
     """ Refine the pointing for an image
 
     Parameters
@@ -159,14 +168,15 @@ def refine_pointing(image, guess_wcs, observed_coords=None, catalog=None,
         background = sep.Background(image, bw=background_width, bh=background_height)
         data_sub = image - background
         objects = sep.extract(data_sub, detection_threshold, err=background.globalrms)
-        objects = pd.DataFrame(objects).sort_values('flux')[-3*num_stars:]
+        objects = pd.DataFrame(objects).sort_values('flux')
         observed_coords = np.stack([objects["x"], objects["y"]], axis=-1)
-
+        if mask is not None:
+            observed_coords = observed_coords[mask(objects['x'], objects['y'])]
+        observed_coords = observed_coords[-3*num_stars:]
     # set up the optimization
     params = Parameters()
-    delta_ratio = guess_wcs.wcs.cdelt[0] / guess_wcs.wcs.cdelt[1]
-    initial_crota = np.arctan2(guess_wcs.wcs.pc[0, 1]/delta_ratio, guess_wcs.wcs.pc[0, 0])
-    params.add("crota", value=initial_crota, min=-np.pi, max=np.pi)
+    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)
 
@@ -176,7 +186,7 @@ def refine_pointing(image, guess_wcs, observed_coords=None, catalog=None,
     while trial_num < max_trials:
         try:
             out = minimize(_residual, params, method=method,
-                           args=(observed_coords, catalog, guess_wcs, num_stars, image.shape))
+                           args=(observed_coords, catalog, guess_wcs, num_stars, image.shape, edge, sigma, mask))
             chisqr = out.chisqr
             result_minimizations.append(out)
         except IndexError:
@@ -195,6 +205,7 @@ def refine_pointing(image, guess_wcs, observed_coords=None, catalog=None,
             result_wcs.wcs.pc = calculate_pc_matrix(out.params["crota"], result_wcs.wcs.cdelt)
             result_wcs.cpdis1 = guess_wcs.cpdis1  # TODO: what if there is no known distortion
             result_wcs.cpdis2 = guess_wcs.cpdis2
+            result_wcs.wcs.set_pv(guess_wcs.wcs.get_pv())
         result_wcses.append(result_wcs)
         trial_num += 1
         if chisqr < chisqr_threshold:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thuban
-Version: 0.0.2
+Version: 0.0.4
 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>

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

@@ -1,7 +1,24 @@
+.gitignore
+.pre-commit-config.yaml
+.readthedocs.yaml
+CITATION.cff
 LICENSE
 MANIFEST.in
 README.md
+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
+docs/index.rst
+docs/make.bat
+docs/_static/favicon.ico
+docs/_static/logo.png
+scripts/prepare_reduced_hip.py
+tests/__init__.py
 tests/test_catalog.py
 tests/test_cli.py
 tests/test_distortion.py