acstools 3.7.2__tar.gz → 3.8.1__tar.gz

acstools-3.8.1/.flake8

@@ -0,0 +1,10 @@
+[flake8]
+# Ignoring these for now:
+# E221: multiple spaces before operator
+# E226: missing whitespace around arithmetic operator
+# E262: inline comment should start with '# '
+# E265: block comment should start with '#'
+# E501: line too long
+# E704: multiple statements on one line (def)
+# W504: line break after binary operator
+ignore = E221,E226,E262,E265,E501,E704,W504

{acstools-3.7.2 → acstools-3.8.1}/.github/dependabot.yml

@@ -12,7 +12,8 @@ updates:
       actions:
         patterns:
           - "*"
-    open-pull-requests-limit: 10
+    cooldown:
+      default-days: 7
 
   # Maintain dependencies for pip
   - package-ecosystem: "pip"
@@ -25,4 +26,5 @@ updates:
       actions:
         patterns:
           - "*"
-    open-pull-requests-limit: 10
+    cooldown:
+      default-days: 7

{acstools-3.7.2 → acstools-3.8.1}/.github/workflows/ci_workflows.yml

@@ -3,6 +3,7 @@ name: CI
 on:
   push:
   pull_request:
+  workflow_dispatch:
   schedule:
     # Weekly Tuesday 6 AM build
     # * is a special character in YAML so you have to quote this string
@@ -21,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check base branch
-      uses: actions/github-script@v7
+      uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3  # v9.0.0
       if: github.event_name == 'pull_request'
       with:
         script: |
@@ -35,7 +36,7 @@ jobs:
 
   tests:
     needs: initial_checks
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@2835f0cacddf3f8de198db9afdb5354a5cebe0ef  # v2.6.3
     with:
       setenv: |
         jref: "https://ssb.stsci.edu/trds_open/jref"
@@ -55,10 +56,10 @@ jobs:
         - name: Check links
           linux: linkcheck
 
-        - name: Python 3.9 with remote data and all dependencies
-          linux: py39-test-alldeps
+        - name: Python 3.10 with remote data and all dependencies
+          linux: py310-test-alldeps
           posargs: --remote-data -v
 
-        - name: Python 3.12 with remote data and dev dependencies
-          linux: py312-test-devdeps
+        - name: Python 3.14 with remote data and dev dependencies
+          linux: py314-test-devdeps
           posargs: --remote-data -v

{acstools-3.7.2 → acstools-3.8.1}/.github/workflows/codeql-analysis.yml

@@ -37,11 +37,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@5618c9fc1e675841ca52c1c6b1304f5255a905a0  # codeql-bundle-v2.19.0

acstools-3.8.1/.github/workflows/open_actions.yml

@@ -0,0 +1,27 @@
+name: When Opened
+
+on:
+  issues:
+    types:
+    - opened
+  pull_request_target:
+    types:
+    - opened
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Label PR
+      uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b  # v6.0.1
+      if: github.event_name == 'pull_request_target' || github.event_name == 'pull_request'
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    #- name: Special comment
+    #  uses: pllim/action-special_pr_comment@5126c189c02418a55448480b28efd1a00af48d7b  # 0.2
+    #  with:
+    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{acstools-3.7.2 → acstools-3.8.1}/.github/workflows/predeps_workflows.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   rc_tests:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@2835f0cacddf3f8de198db9afdb5354a5cebe0ef  # v2.6.3
     with:
       setenv: |
         jref: "https://ssb.stsci.edu/trds_open/jref"
@@ -20,6 +20,6 @@ jobs:
       coverage: ''
       # TODO: Enable more OSes when possible.
       envs: |
-        - name: Python 3.11 with pre-release
-          linux: py311-test-predeps
+        - name: Python 3.13 with pre-release
+          linux: py313-test-predeps
           posargs: --remote-data -v

{acstools-3.7.2 → acstools-3.8.1}/.github/workflows/publish-to-pypi.yml

@@ -32,11 +32,11 @@ jobs:
     if: (github.repository == 'spacetelescope/acstools' && (github.event_name == 'push' ||  contains(github.event.pull_request.labels.*.name, 'Build wheels')))
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
       with:
         python-version: '3.11'
 
@@ -56,7 +56,7 @@ jobs:
     # Use appropriate token if debugging with TestPyPI
     - name: Publish distribution 📦 to PyPI
       if: (startsWith(github.ref, 'refs/tags/') && github.event_name == 'push')
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b  # v1.14.0
       with:
         user: __token__
         password: ${{ secrets.PYPI_TOKEN }}

{acstools-3.7.2 → acstools-3.8.1}/PKG-INFO

@@ -1,34 +1,32 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: acstools
-Version: 3.7.2
+Version: 3.8.1
 Summary: Python Tools for HST ACS
-Home-page: https://github.com/spacetelescope/acstools
 Author: Matt Davis, Warren Hack, Norman Grogin, Pey Lian Lim, Sara Ogaz, Leonardo Ubeda, Mihai Cara, David Borncamp, Nathan Miles, Tyler Desjardins, Jenna Ryon, David Stark, Gagandeep Anand, Yotam Cohen
-Author-email: help@stsci.edu
-License: BSD
-Project-URL: Bug Reports, https://github.com/spacetelescope/acstools/issues/
-Project-URL: Source, https://github.com/spacetelescope/acstools/
+License-Expression: BSD-3-Clause
+Project-URL: Bug Reports, https://github.com/spacetelescope/acstools/issues
+Project-URL: Source, https://github.com/spacetelescope/acstools
 Project-URL: Help, https://hsthelp.stsci.edu
+Project-URL: Documentation, https://acstools.readthedocs.io
 Keywords: astronomy,astrophysics,calibration
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
-Description-Content-Type: text/plain
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: numpy
-Requires-Dist: astropy>=3.1
+Requires-Dist: astropy
 Requires-Dist: requests
 Requires-Dist: PyYAML
 Provides-Extra: all
 Requires-Dist: matplotlib; extra == "all"
 Requires-Dist: scipy; extra == "all"
-Requires-Dist: scikit-image; extra == "all"
+Requires-Dist: scikit-image>=0.11; extra == "all"
 Requires-Dist: stsci.tools; extra == "all"
 Requires-Dist: stsci.imagestats; extra == "all"
 Requires-Dist: photutils; extra == "all"
@@ -42,5 +40,34 @@ Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-automodapi; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: numpydoc; extra == "docs"
+Dynamic: license-file
 
-Python Tools for HST ACS (Advanced Camera for Surveys) Data
+ACSTOOLS
+========
+
+.. image:: https://img.shields.io/badge/ascl-2011.024-blue.svg?colorB=262255
+    :target: https://ascl.net/2011.024
+    :alt: ascl:2011.024
+
+.. image:: https://readthedocs.org/projects/acstools/badge/?version=latest
+    :alt: Documentation Status
+    :target: https://acstools.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://github.com/spacetelescope/acstools/workflows/CI/badge.svg
+    :target: https://github.com/spacetelescope/acstools/actions?query=workflow%3ACI
+    :alt: Github Actions CI Status
+
+Python Tools for HST ACS (Advanced Camera for Surveys) Data.
+
+For v3.5 or later:
+
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7406933.svg
+   :alt: zenodo.7406933
+   :target: https://doi.org/10.5281/zenodo.7406933
+
+For older versions:
+
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3728240.svg
+   :alt: zenodo.3728240
+   :target: https://doi.org/10.5281/zenodo.3728240

{acstools-3.7.2 → acstools-3.8.1}/README.rst

@@ -13,6 +13,8 @@ ACSTOOLS
     :target: https://github.com/spacetelescope/acstools/actions?query=workflow%3ACI
     :alt: Github Actions CI Status
 
+Python Tools for HST ACS (Advanced Camera for Surveys) Data.
+
 For v3.5 or later:
 
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7406933.svg

{acstools-3.7.2 → acstools-3.8.1}/acstools/acs_destripe.py

@@ -232,7 +232,7 @@ def clean(input, suffix, stat="pmode1", maxiter=15, sigrej=2.0,
         The string to use to add to each input file name to
         indicate an output product. This string will be appended
         to the suffix in each input filename to create the
-        new output filename. For example, setting `suffix='csck'`
+        new output filename. For example, setting ``suffix='csck'``
         will create '\*_csck.fits' images.
 
     stat : { 'pmode1', 'pmode2', 'mean', 'mode', 'median', 'midpt' } (Default = 'pmode1')
@@ -286,7 +286,7 @@ def clean(input, suffix, stat="pmode1", maxiter=15, sigrej=2.0,
         Histogram's bin width, in sigma units, used to sample the
         distribution of pixel brightness values in order to compute the
         background statistics. This parameter is aplicable *only* to *stat*
-        parameter values of `'mode'` or `'midpt'`.
+        parameter values of ``'mode'`` or ``'midpt'``.
 
     clobber : bool
         Specify whether or not to 'clobber' (delete then replace)
@@ -307,7 +307,7 @@ def clean(input, suffix, stat="pmode1", maxiter=15, sigrej=2.0,
         computations. For example, if pixels in the DQ array can be
         combinations of 1, 2, 4, and 8 flags and one wants to consider
         DQ "defects" having flags 2 and 4 as being acceptable for de-striping
-        computations, then `dqbits` should be set to 2+4=6. Then a DQ pixel
+        computations, then ``dqbits`` should be set to 2+4=6. Then a DQ pixel
         having values 2,4, or 6 will be considered a good pixel, while a DQ
         pixel with a value, e.g., 1+2=3, 4+8=12, etc. will be flagged
         as a "bad" pixel.
@@ -315,30 +315,30 @@ def clean(input, suffix, stat="pmode1", maxiter=15, sigrej=2.0,
         Alternatively, one can enter a comma- or '+'-separated list of
         integer bit flags that should be added to obtain the final
         "good" bits. For example, both ``4,8`` and ``4+8`` are equivalent to
-        setting `dqbits` to 12.
+        setting ``dqbits`` to 12.
 
-        | Set `dqbits` to 0 to make *all* non-zero pixels in the DQ
+        | Set ``dqbits`` to 0 to make *all* non-zero pixels in the DQ
           mask to be considered "bad" pixels, and the corresponding image
           pixels not to be used for de-striping computations.
 
         | Default value (`None`) will turn off the use of image's DQ array
           for de-striping computations.
 
-        | In order to reverse the meaning of the `dqbits`
+        | In order to reverse the meaning of the ``dqbits``
           parameter from indicating values of the "good" DQ flags
           to indicating the "bad" DQ flags, prepend '~' to the string
           value. For example, in order not to use pixels with
           DQ flags 4 and 8 for sky computations and to consider
           as "good" all other pixels (regardless of their DQ flag),
-          set `dqbits` to ``~4+8``, or ``~4,8``. To obtain the
+          set ``dqbits`` to ``~4+8``, or ``~4,8``. To obtain the
           same effect with an `int` input value (except for 0),
           enter -(4+8+1)=-9. Following this convention,
-          a `dqbits` string value of ``'~0'`` would be equivalent to
+          a ``dqbits`` string value of ``'~0'`` would be equivalent to
           setting ``dqbits=None``.
 
         .. note::
             DQ masks (if used), *will be* combined with user masks specified
-            in the `mask1` and `mask2` parameters (if any).
+            in the ``mask1`` and ``mask2`` parameters (if any).
 
     rpt_clean : int
         An integer indicating how many *additional* times stripe cleaning
@@ -346,8 +346,8 @@ def clean(input, suffix, stat="pmode1", maxiter=15, sigrej=2.0,
 
     atol : float, None
         The threshold for maximum absolute value of bias stripe correction
-        below which repeated cleanings can stop. When `atol` is `None`
-        cleaning will be repeated `rpt_clean` number of times.
+        below which repeated cleanings can stop. When ``atol`` is `None`
+        cleaning will be repeated ``rpt_clean`` number of times.
         Default = 0.01 [e].
 
     verbose : bool

{acstools-3.7.2 → acstools-3.8.1}/acstools/acs_destripe_plus.py

@@ -148,7 +148,7 @@ def destripe_plus(inputfile, suffix='strp', stat='pmode1', maxiter=15,
         * 'mode' - the mode of the distribution of the "good" pixels;
         * 'median' - the median of the distribution of the "good" pixels;
         * 'midpt' - estimate of the median of the distribution of the "good"
-          pixels based on an algorithm similar to IRAF's `imagestats` task
+          pixels based on an algorithm similar to IRAF's ``imagestats`` task
           (``CDF(midpt)=1/2``).
 
         .. note::
@@ -184,7 +184,7 @@ def destripe_plus(inputfile, suffix='strp', stat='pmode1', maxiter=15,
         Histogram's bin width, in sigma units, used to sample the
         distribution of pixel brightness values in order to compute the
         background statistics. This parameter is aplicable *only* to *stat*
-        parameter values of `'mode'` or `'midpt'`.
+        parameter values of ``'mode'`` or ``'midpt'``.
 
     scimask1 : str or list of str
         Mask images for *calibrated* ``SCI,1``, one for each input file.
@@ -201,7 +201,7 @@ def destripe_plus(inputfile, suffix='strp', stat='pmode1', maxiter=15,
         computations. For example, if pixels in the DQ array can be
         combinations of 1, 2, 4, and 8 flags and one wants to consider
         DQ "defects" having flags 2 and 4 as being acceptable for de-striping
-        computations, then `dqbits` should be set to 2+4=6. Then a DQ pixel
+        computations, then ``dqbits`` should be set to 2+4=6. Then a DQ pixel
         having values 2,4, or 6 will be considered a good pixel, while a DQ
         pixel with a value, e.g., 1+2=3, 4+8=12, etc. will be flagged
         as a "bad" pixel.
@@ -209,30 +209,30 @@ def destripe_plus(inputfile, suffix='strp', stat='pmode1', maxiter=15,
         Alternatively, one can enter a comma- or '+'-separated list of
         integer bit flags that should be added to obtain the final
         "good" bits. For example, both ``4,8`` and ``4+8`` are equivalent to
-        setting `dqbits` to 12.
+        setting ``dqbits`` to 12.
 
-        | Set `dqbits` to 0 to make *all* non-zero pixels in the DQ
+        | Set ``dqbits`` to 0 to make *all* non-zero pixels in the DQ
           mask to be considered "bad" pixels, and the corresponding image
           pixels not to be used for de-striping computations.
 
         | Default value (`None`) will turn off the use of image's DQ array
           for de-striping computations.
 
-        | In order to reverse the meaning of the `dqbits`
+        | In order to reverse the meaning of the ``dqbits``
           parameter from indicating values of the "good" DQ flags
           to indicating the "bad" DQ flags, prepend '~' to the string
           value. For example, in order not to use pixels with
           DQ flags 4 and 8 for sky computations and to consider
           as "good" all other pixels (regardless of their DQ flag),
-          set `dqbits` to ``~4+8``, or ``~4,8``. To obtain the
+          set ``dqbits`` to ``~4+8``, or ``~4,8``. To obtain the
           same effect with an `int` input value (except for 0),
           enter -(4+8+1)=-9. Following this convention,
-          a `dqbits` string value of ``'~0'`` would be equivalent to
+          a ``dqbits`` string value of ``'~0'`` would be equivalent to
           setting ``dqbits=None``.
 
         .. note::
             DQ masks (if used), *will be* combined with user masks specified
-            in the `scimask1` and `scimask2` parameters (if any).
+            in the ``scimask1`` and ``scimask2`` parameters (if any).
 
     rpt_clean : int
         An integer indicating how many *additional* times stripe cleaning
@@ -240,8 +240,8 @@ def destripe_plus(inputfile, suffix='strp', stat='pmode1', maxiter=15,
 
     atol : float, None
         The threshold for maximum absolute value of bias stripe correction
-        below which repeated cleanings can stop. When `atol` is `None`
-        cleaning will be repeated `rpt_clean` number of times.
+        below which repeated cleanings can stop. When ``atol`` is `None`
+        cleaning will be repeated ``rpt_clean`` number of times.
         Default = 0.01 [e].
 
     cte_correct : bool

{acstools-3.7.2 → acstools-3.8.1}/acstools/acssum.py

@@ -38,9 +38,9 @@ def acssum(input, output, exec_path='', time_stamps=False, verbose=False,
 
     output : str
         Output filename.
-        If `output` is '' and `input` is '\*_asn.fits',
-        `output` will be automatically set to '\*_sfl.fits'.
-        Otherwise, it is an error not to provide a specific `output`.
+        If ``output`` is '' and ``input`` is '\*_asn.fits',
+        ``output`` will be automatically set to '\*_sfl.fits'.
+        Otherwise, it is an error not to provide a specific ``output``.
 
     exec_path : str, optional
         The complete path to ACSSUM executable.

{acstools-3.7.2 → acstools-3.8.1}/acstools/acszpt.py

@@ -255,6 +255,8 @@ class Query:
             dt_obj = dt.datetime.strptime(self.date, fmt)
         except ValueError:
             result = f'{self.date} does not match YYYY-MM-DD format'
+        except Exception:  # nosec
+            pass
         else:
             if dt_obj < self._acs_installation_date:
                 result = ('The observation date cannot occur '
@@ -264,8 +266,8 @@ class Query:
                 result = ('The observation date cannot be '
                           'after 2029 '
                           f'({self._end_table_date.strftime(fmt)})')
-        finally:
-            return result
+
+        return result
 
     def fetch(self):
         """Function to query API on AWS APIGateway for zeropoints for single or all

{acstools-3.7.2 → acstools-3.8.1}/acstools/calacs.py

@@ -56,7 +56,7 @@ def calacs(input_file, exec_path=None, time_stamps=False, temp_files=False,
     exe_args : list, optional
         Arbitrary arguments passed to underlying executable call.
         Note: Implementation uses subprocess.call and whitespace is not
-        permitted. E.g. use exe_args=['--nThreads', '1']
+        permitted. E.g., use exe_args=['--nThreads', '1']
 
     """
     if exec_path:

{acstools-3.7.2 → acstools-3.8.1}/acstools/findsat_mrt.py

@@ -144,32 +144,32 @@ class TrailFinder:
         The specific header for the FITS extension being used. This is
         added onto the catalog. Default is `None`.
     save_image_header_keys : list, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.save_image_header_keys`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.save_image_header_keys`.
         Default is an empty list (nothing saved from ``image_header``).
     processes : int, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.processes`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.processes`.
         The default is 2.
     min_length : int, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.min_length`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.min_length`.
         The default is 25 pixels.
     max_width : int, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.max_width`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.max_width`.
         The default is 75 pixels.
     buffer : int, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.buffer`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.buffer`.
         The default is 250 pixels on each side.
     threshold : float, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.threshold`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.threshold`.
         The default is 5.
     theta : ndarray, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.theta`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.theta`.
         The default is `None`, which sets to ``numpy.arange(0, 180, 0.5)``.
     kernels : list, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.kernels`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.kernels`.
         The default is `None`, which reverts to using the 3-, 7-, and 15-pixel
         wide kernels included with this package.
     mask_include_status : list, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.mask_include_status`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.mask_include_status`.
         The default is ``[2]``.
     plot : bool, optional
         Plot all intermediate steps. When set, plots of the input image, MRT
@@ -186,31 +186,31 @@ class TrailFinder:
         :func:`acstools.findsat_mrt.TrailFinder.plot_segment`. The default is
         `False`.
     output_dir : str, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.output_dir`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.output_dir`.
         The default is ``'.'`` (current directory).
     output_root : string, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.root`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.root`.
         The default is ``''`` (no prefix).
     check_persistence : bool, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.check_persistence`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.check_persistence`.
         The default is `True`.
     min_persistence : float, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.min_persistence`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.min_persistence`.
         Must be between 0 and 1. The default is 0.5.
     ignore_theta_range : list of tuples or `None`, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.ignore_theta_range`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.ignore_theta_range`.
         Default is `None`.
     save_catalog : bool, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.save_catalog`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.save_catalog`.
         Default is `True`.
     save_diagnostic : bool, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.save_diagnostic`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.save_diagnostic`.
         Default is `True`.
     save_mrt : bool, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.save_mrt`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.save_mrt`.
         Default is `False`.
     save_mask : bool, optional
-        See :attr:`~acstools.utils_findsat_mrt.TrailFinder.save_mask`.
+        See :attr:`~acstools.findsat_mrt.TrailFinder.save_mask`.
         Default is `False`.
 
     '''  # noqa
@@ -755,11 +755,17 @@ class TrailFinder:
         '''
         # test for photutils
         try:
+            import photutils
             from photutils.detection import StarFinder
         except ImportError:
             LOG.error('photutils not installed. Source detection will not work.')  # noqa
             return
 
+        from astropy.utils import minversion
+
+        PHOTUTILS_LT_3 = not minversion(photutils, "2.3.1.dev")  # dev tag a little off
+        photutils.future_column_names = True
+
         LOG.info('Detection threshold: {}'.format(self.threshold))
 
         snrmap = self.mrt / self.mrt_err
@@ -773,13 +779,15 @@ class TrailFinder:
                 LOG.info('Using kernel {}'.format(k))
 
                 # detect sources
+                if PHOTUTILS_LT_3:
+                    kwargs = {"brightest": None, "peakmax": None}
+                else:
+                    kwargs = {"n_brightest": None, "peak_max": None}
                 s = StarFinder(self.threshold, kernel, min_separation=20,
-                               exclude_border=False, brightest=None,
-                               peakmax=None)
+                               exclude_border=False, **kwargs)
 
             # can fail for cases where nothing found. Allow code to return
             # nothing and move on
-
             tbl = s.find_stars(snrmap, mask=snrmap_mask)
             if tbl is None:
                 nsources = 0
@@ -789,6 +797,12 @@ class TrailFinder:
             LOG.info('{{no}} sources found using kernel: {}'.format(nsources))
 
             if nsources > 0:
+                if not PHOTUTILS_LT_3:
+                    col_map = {'x_centroid': 'xcentroid',
+                               'y_centroid': 'ycentroid'}
+                    for col in col_map:
+                        tbl.rename_column(col, col_map[col])
+
                 tbl = tbl[np.isfinite(tbl['xcentroid'])]
                 LOG.info('{} sources found using kernel'.format(len(tbl)))
                 if (len(tbls) > 0):
@@ -809,10 +823,14 @@ class TrailFinder:
         # add the theta and rho values to the table
         if self.source_list is not None:
             dtheta = self.theta[1] - self.theta[0]
-            self.source_list['theta'] = self.theta[0] + \
+            self.source_list['theta'] = (
+                self.theta[0] +
                 dtheta * self.source_list['xcentroid']
-            self.source_list['rho'] = self.rho[0] + \
+            )
+            self.source_list['rho'] = (
+                self.rho[0] +
                 self.source_list['ycentroid']
+            )
 
             # Add the status array and endpoints array. Status will be zero
             # because no additional checks have been done yet.
@@ -1208,10 +1226,10 @@ class WfcWrapper(TrailFinder):
         Extension of input file to read. This keyword is required if the input
         image is an FLC/FLT file. The default is `None`.
     binsize : int or `None`, optional
-        See :attr:`~acstools.utils_findsat_mrt.WfcWrapper.binsize`.
+        See :attr:`~acstools.findsat_mrt.WfcWrapper.binsize`.
         The default is `None` (no binning).
     ignore_flags : list of int
-        See :attr:`~acstools.utils_findsat_mrt.WfcWrapper.ignore_flags`.
+        See :attr:`~acstools.findsat_mrt.WfcWrapper.ignore_flags`.
         Default is ``[4096, 8192, 16384]``.
     preprocess : bool, optional
         Flag to run all the preprocessing steps (bad pixel flagging,

{acstools-3.7.2 → acstools-3.8.1}/acstools/polarization_tools.py

@@ -259,7 +259,7 @@ class PolarizerTables:
 
         Returns
         -------
-        pol_tables : `~acstools.polarizer_tools.PolarizerTables`
+        pol_tables : `~acstools.polarization_tools.PolarizerTables`
         """
         with open(yaml_file, 'r') as yf:
             input_dict = yaml.safe_load(yf)
@@ -273,7 +273,7 @@ class PolarizerTables:
 
         Returns
         -------
-        pol_tables : `~acstools.polarizer_tools.PolarizerTables`
+        pol_tables : `~acstools.polarization_tools.PolarizerTables`
         """
         filename = get_pkg_data_filename(os.path.join('data', 'polarizer_tables.yaml'))
         return cls.from_yaml(filename)