astropop 0.9.5.dev9__tar.gz → 0.9.5.dev26__tar.gz

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/.github/workflows/build-n-publish.yml

@@ -12,13 +12,13 @@ jobs:
     name: Build and publish to PyPi
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: '3.13'
     - name: Install pypa/build
       run: >-
         python -m

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/.github/workflows/ci_devdeps.yml

@@ -23,19 +23,20 @@ jobs:
       libraries: |
         apt:
           - tzdata
-          - libopenblas-base
           - libopenblas-dev
       envs: |
-        - name: (Allowed Failure) Python 3.12 with dev version of deps
-          linux: py313-test-devdeps-online
-          python-version: 3.13-dev
-
+        # Live service compatibility is checked in CI's online conformance job.
+        # These environments exercise dependency/platform changes with mocks.
         - name: (Allowed Failure) Python 3.13 with dev version of deps
-          linux: py313-test-devdeps-online
-          python-version: 3.12
+          linux: py313-test-devdeps
+          python-version: '3.13'
+
+        - name: (Allowed Failure) Python 3.14 with dev version of deps
+          linux: py314-test-devdeps
+          python-version: '3.14'
 
-        - macos: py312-test-online
-          cache-key: ${{ github.ref }}-py312mac-astropycache
+        - macos: py313-test
+          cache-key: ${{ github.ref }}-py313mac-astropycache
 
-        - windows: py312-test-online
-          cache-key: ${{ github.ref }}-py312win-astropycache
+        - windows: py313-test
+          cache-key: ${{ github.ref }}-py313win-astropycache

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/.github/workflows/ci_workflows.yml

@@ -20,16 +20,25 @@ jobs:
     with:
       cache-path: ~/.astropy
       envs: |
-        - linux: py38-test-olddeps-online
-          cache-key: ${{ github.ref }}-py38lin-astropycache
-        - linux: py39-test-online
-          cache-key: ${{ github.ref }}-py39lin-astropycache
-        - linux: py310-test-online
+        - linux: py310-test-olddeps
           cache-key: ${{ github.ref }}-py310lin-astropycache
-        - linux: py311-test-online
+        - linux: py311-test
           cache-key: ${{ github.ref }}-py311lin-astropycache
-        - linux: py312-test-online
+        - linux: py312-test
           cache-key: ${{ github.ref }}-py312lin-astropycache
+        - linux: py313-test
+          cache-key: ${{ github.ref }}-py313lin-astropycache
+        - linux: py314-test
+          cache-key: ${{ github.ref }}-py314lin-astropycache
+
+  online_conformance:
+    name: Online catalog conformance
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    if: "!(contains(github.event.head_commit.message, '[skip ci]') || contains(github.event.head_commit.message, '[ci skip]'))"
+    with:
+      envs: |
+        - linux: py314-catalogs-online
+          python-version: '3.14'
 
   build_docs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
@@ -68,14 +77,12 @@ jobs:
         path: ${{ env.CONDA }}/envs
         key:
           ${{ github.ref }}-${{ runner.os }}-${{ runner.arch }}-${{ steps.get-date.outputs.today }}-conda-envs-${{ hashFiles('pyproject.toml') }}
-    - uses: conda-incubator/setup-miniconda@v2
+    - uses: conda-incubator/setup-miniconda@v4
       with:
-        miniforge-variant: Mambaforge
         miniforge-version: latest
         activate-environment: astropop
-        use-mamba: true
-        mamba-version: "*"
-        channels: conda-forge,defaults
+        channels: conda-forge
+        conda-remove-defaults: true
         python-version: "3.12"
     - name: Cache astropy cache
       uses: actions/cache@v3
@@ -87,7 +94,7 @@ jobs:
     - name: Install dependencies
       shell: bash -l {0}
       run: |
-        mamba install -y -q pytest astrometry \
+        conda install -y -q pytest astrometry \
                             astropy scipy numpy matplotlib \
                             scikit-image scikit-learn \
                             sep astroquery
@@ -104,7 +111,7 @@ jobs:
     - name: Run Pytest and generate coverage
       shell: bash -l {0}
       run: |
-        pytest --pyargs ./tests ./docs --remote-data --cov astropop --cov-config=./pyproject.toml
+        pytest --pyargs ./tests ./docs --remote-data=none --cov astropop --cov-config=./pyproject.toml
         coverage xml -o ./coverage.xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: astropop
-Version: 0.9.5.dev9
+Version: 0.9.5.dev26
 Summary: Astronomical Polarimetry and Photometry Pipeline
 Author-email: Julio Campagnolo <julio.campagnolo@cefet-rj.br>
 License: BSD-3-Clause
@@ -17,15 +17,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
-Requires-Dist: astropy>=4.3
-Requires-Dist: numpy>=1.17
-Requires-Dist: scipy>=1.6
+Requires-Dist: astropy>=5.0
+Requires-Dist: numpy>=1.21.6
+Requires-Dist: scipy>=1.7.3
 Requires-Dist: astroquery
 Requires-Dist: scikit-image
 Requires-Dist: scikit-learn
-Requires-Dist: photutils>=1.7
+Requires-Dist: photutils<3,>=1.7
 Requires-Dist: pytz
 Requires-Dist: pyyaml
 Requires-Dist: astroscrappy
@@ -40,7 +40,9 @@ Requires-Dist: pytest-astropy; extra == "test"
 Requires-Dist: pytest-remotedata; extra == "test"
 Requires-Dist: testfixtures; extra == "test"
 Requires-Dist: pytest-rerunfailures; extra == "test"
+Requires-Dist: vcrpy>=7; extra == "test"
 Provides-Extra: docs
+Requires-Dist: matplotlib; extra == "docs"
 Requires-Dist: ipython; extra == "docs"
 Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/_online_tools.py

@@ -76,9 +76,13 @@ def astroquery_skycoord(center, simbad=None):
             if simbad is None:
                 simbad = Simbad()
             t = simbad.query_object(center)
-            if t is None:
+            if t is None or len(t) == 0:
                 raise ValueError(f'Coordinates {center} could not be'
                                  ' resolved.')
+            # The TAP interface (Astroquery >= 0.4.8) returns degrees
+            # under lowercase names; the legacy interface used sexagesimal.
+            if 'ra' in t.colnames and 'dec' in t.colnames:
+                return SkyCoord(t['ra'][0], t['dec'][0], unit='deg')
             return guess_coordinates(t['RA'][0], t['DEC'][0], skycoord=True)
     if isinstance(center, (tuple, list, np.ndarray)) and len(center) == 2:
         return guess_coordinates(center[0], center[1], skycoord=True)

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/gaia.py

@@ -2,11 +2,14 @@
 """Query and match objects in catalogs using TAP services."""
 
 import copy
+import time
+from contextlib import contextmanager
 import numpy as np
 from astropy.coordinates import SkyCoord
 from astropy import units as u
 from astroquery.gaia import Gaia
 from astropy.time import Time
+from astropy.table import vstack
 
 from ._sources_catalog import _OnlineSourcesCatalog, SourcesCatalog
 from ._online_tools import astroquery_query, string_fix
@@ -16,6 +19,45 @@ from ..math import QFloat
 __all__ = ['GaiaDR3SourcesCatalog', 'gaiadr3']
 
 
+@contextmanager
+def _gaia_query_timeout(client, timeout=300):
+    """Limit socket waits using one budget for the whole Gaia query.
+
+    The deadline is checked when a connection is created; its remaining time
+    becomes that socket's inactivity timeout. This is not a hard wall-clock
+    limit on DNS resolution, a continuously streaming response, or parsing.
+    """
+    # Gaia can accept an async job but leave it in EXECUTING for minutes, even
+    # for a tiny result. A successful availability request does not rule this
+    # out. Astroquery polls the job without an overall deadline, and its TAP
+    # sockets have no explicit timeout, so even a status read can hang.
+    #
+    # The TAP client has no public timeout setter. Adapt the connection factory
+    # only on this catalog's deepcopy of Gaia, preserving the configured host
+    # and avoiding process-wide socket changes. Restore it on success or error.
+    handler = client._TapPlus__getconnhandler()._TapConn__connectionHandler
+    original = handler.get_connection
+    deadline = time.monotonic() + timeout
+    connections = []
+
+    def get_connection(*args, **kwargs):
+        remaining = deadline - time.monotonic()
+        if remaining <= 0:
+            raise TimeoutError('Gaia query timed out.')
+        connection = original(*args, **kwargs)
+        connection.timeout = remaining
+        connections.append(connection)
+        return connection
+
+    handler.get_connection = get_connection
+    try:
+        yield
+    finally:
+        handler.get_connection = original
+        for connection in connections:
+            connection.close()
+
+
 class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
     """Sources catalog from Gaia-DR3 catalog.
 
@@ -43,10 +85,16 @@ class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
         Maximum G-band magnitude to query. If None, no magnitude
         filtering will be performed. Default is None.
 
+    query_mode: {'async', 'sync'} (optional)
+        Use asynchronous jobs (default) or synchronous requests. Synchronous
+        queries fetch pages of at most 2000 sources and return the complete
+        result sorted by distance, without creating asynchronous jobs.
+
     Raises
     ------
     ValueError:
-        If a ``band`` not available in the filters is passed.
+        If a ``band`` not available in the filters is passed, or
+        ``query_mode`` is not ``'async'`` or ``'sync'``.
     """
 
     _available_filters = ['G', 'BP', 'RP']
@@ -58,7 +106,11 @@ class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
                 'phot_variable_flag', 'non_single_star',
                 'in_galaxy_candidates']
 
-    def __init__(self, center, radius, band='all', max_g_mag=None):
+    def __init__(self, center, radius, band='all', max_g_mag=None, *,
+                 query_mode='async'):
+        if query_mode not in ('async', 'sync'):
+            raise ValueError("query_mode must be 'async' or 'sync'.")
+        self._query_mode = query_mode
         self._setup_catalog()
         self._max_g_mag = max_g_mag
         _OnlineSourcesCatalog.__init__(self, center, radius=radius, band=band)
@@ -103,10 +155,24 @@ class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
         mag_err = 1.1/np.array(query[f'phot_{f}_mean_flux_over_error'])
         return QFloat(mag, mag_err, unit='mag')
 
-    def _query_object_async(self, center, radius=None, columns=None):
-        """Construct the query and launch job. Good for max_g_mag filtering."""
-        # Based on astroquery.gaia.Gaia.query_object_async
+    def _query_object(self, center, radius=None, columns=None):
+        """Query a cone using the selected TAP mode and sort by distance."""
+        # Based on astroquery.gaia.Gaia.query_object_async. Sync mode bypasses
+        # async job execution/polling, which was slow even when the same SQL
+        # completed promptly through /sync. It can still suffer network or
+        # server timeouts; it is an alternative path, not a timeout guarantee.
+        sync = self._query_mode == 'sync'
+        # Astroquery's synchronous launcher limits results to 2000 rows, even
+        # with Gaia.ROW_LIMIT = -1. Page by unique source_id to avoid truncation.
+        # Distance is not a safe cursor because multiple sources can tie.
+        # Keep IDs as integers (Gaia IDs exceed float's exact-integer range),
+        # and remove this extra column unless the caller requested it.
+        include_id = sync and 'source_id' not in columns
         columns = ','.join(map(str, columns))
+        if include_id:
+            columns += ',source_id'
+        row_limit = 'TOP 2000' if sync else ''
+        order = 'source_id ASC' if sync else 'dist ASC'
 
         ra = center.ra.degree
         dec = center.dec.degree
@@ -117,7 +183,7 @@ class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
             mag_filtering = ''
 
         query = f"""
-            SELECT
+            SELECT {row_limit}
                 {columns},
                 DISTANCE(
                     POINT('ICRS', {self._g.MAIN_GAIA_TABLE_RA},
@@ -132,18 +198,51 @@ class GaiaDR3SourcesCatalog(_OnlineSourcesCatalog):
                       CIRCLE('ICRS', {ra}, {dec}, {radius})
                   )
                   {mag_filtering}
+                  {{page_filter}}
                 ORDER BY
-                  dist ASC
+                  {order}
         """
 
-        return self._g.launch_job_async(query,
-                                        dump_to_file=False).get_results()
+        if not sync:
+            return self._g.launch_job_async(query.format(page_filter=''),
+                                            dump_to_file=False).get_results()
+
+        pages = []
+        last_id = None
+        while True:
+            page_filter = ('' if last_id is None else
+                           f'AND source_id > {last_id}')
+            page = self._g.launch_job(query.format(page_filter=page_filter),
+                                      dump_to_file=False).get_results()
+            if page is None:
+                raise RuntimeError('No online catalog result found.')
+            if len(page):
+                next_id = int(page['source_id'][-1])
+                if last_id is not None and next_id <= last_id:
+                    raise RuntimeError('Gaia synchronous pagination stalled.')
+                last_id = next_id
+            pages.append(page)
+            # A full page does not prove that the result is complete. An exact
+            # multiple of 2000 therefore needs one final, empty request.
+            if len(page) < 2000:
+                break
+        result = vstack(pages, join_type='exact') if len(pages) > 1 else pages[0]
+        # Page order is by ID; the catalog API promises angular-distance order.
+        result.sort('dist')
+        if include_id:
+            result.remove_column('source_id')
+        return result
 
     def _do_query(self):
-        self._query = astroquery_query(self._query_object_async,
-                                       self._center,
-                                       radius=self._radius.to(u.deg).value,
-                                       columns=self._columns)
+        # Keep the deadline outside astroquery_query: its timeout retries must
+        # not each get a fresh five-minute budget. In sync mode this same budget
+        # covers every page. An exception propagates instead of exposing a
+        # partial catalog or silently switching back to the slow async path.
+        with _gaia_query_timeout(self._g):
+            self._query = astroquery_query(self._query_object,
+                                           self._center,
+                                           radius=self._radius.to(u.deg).value,
+                                           columns=self._columns)
         sk = SkyCoord(self._query['ra'], self._query['dec'],
                       obstime=Time(self._query['ref_epoch'], format='jyear'),
                       pm_ra_cosdec=self._query['pmra'],

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/simbad.py

@@ -16,6 +16,40 @@ from ..py_utils import string_fix
 __all__ = ['simbad_query_id', 'SimbadSourcesCatalog', 'simbad']
 
 
+def _normalize_tap_result(query, filters):
+    """Pivot TAP flux rows into one legacy-shaped row per source.
+
+    Keep filter names case-sensitive and preserve masked photometry as NaN.
+    Coordinates from TAP remain in degrees.
+    """
+    _, indices = np.unique(query['main_id'], return_index=True)
+    indices.sort()
+    result = query[indices].copy()
+    for key in ('main_id', 'ra', 'dec', 'pmra', 'pmdec', 'coo_bibcode'):
+        result.rename_column(key, key.upper())
+    for band in filters:
+        values = np.full(len(result), np.nan)
+        errors = np.full(len(result), np.nan)
+        bibcodes = []
+        for i, source in enumerate(result['MAIN_ID']):
+            selected = query[(query['main_id'] == source)
+                             & (query['flux.filter'] == band)]
+            bibcode = ''
+            if len(selected):
+                row = selected[0]
+                if not np.ma.is_masked(row['flux']):
+                    values[i] = row['flux']
+                if not np.ma.is_masked(row['flux_err']):
+                    errors[i] = row['flux_err']
+                if not np.ma.is_masked(row['flux.bibcode']):
+                    bibcode = string_fix(row['flux.bibcode'])
+            bibcodes.append(bibcode)
+        result[f'FLUX_{band}'] = values
+        result[f'FLUX_ERROR_{band}'] = errors
+        result[f'FLUX_BIBCODE_{band}'] = bibcodes
+    return result
+
+
 def _simbad_query_id(ra, dec, limit_angle, name_order=None):
     """Query name ids for a star in Simbad. See simbad_query_id.
 
@@ -60,14 +94,23 @@ def _simbad_query_id(ra, dec, limit_angle, name_order=None):
                                                     unit=(u.degree, u.degree)),
                            radius=limit_angle)
 
-    if q is not None:
-        name = string_fix(q['MAIN_ID'][0])
-        ids = _timeout_retry(s.query_objectids, name)['ID']
+    if q is not None and len(q):
+        if 'ra' in q.colnames:
+            coords = SkyCoord(q['ra'], q['dec'], unit='deg')
+            center = SkyCoord(ra, dec, unit='deg')
+            q = q[np.argsort(coords.separation(center))]
+        key = 'main_id' if 'main_id' in q.colnames else 'MAIN_ID'
+        name = string_fix(q[key][0])
+        identifiers = _timeout_retry(s.query_objectids, name)
+        key = 'id' if 'id' in identifiers.colnames else 'ID'
+        ids = identifiers[key]
         for i in name_order:
             if i == 'MAIN_ID':
                 return _strip_spaces(name)
+            if name.startswith(i+' '):
+                return _strip_spaces(name)
             for k in ids:
-                if i+' ' in k:
+                if k.startswith(i+' '):
                     return _strip_spaces(k)
     # If nothing is found, return empty string
     return ''
@@ -146,17 +189,29 @@ class SimbadSourcesCatalog(_OnlineSourcesCatalog):
 
     def _setup_catalog(self):
         self._s = Simbad()
-        self._s.add_votable_fields('pm')
-        self._s.ROW_LIMIT = 0
-        for filt in self.filters:
-            self._s.add_votable_fields(f'fluxdata({filt})')
+        self._tap = hasattr(type(self._s), 'tap')
+        if self._tap:
+            self._s.ROW_LIMIT = -1
+            self._s.add_votable_fields('pmra', 'pmdec', 'coo_bibcode')
+            if self.filters:
+                self._s.add_votable_fields('flux')
+        else:
+            self._s.add_votable_fields('pm')
+            self._s.ROW_LIMIT = 0
+            for filt in self.filters:
+                self._s.add_votable_fields(f'fluxdata({filt})')
 
     def _do_query(self):
         # We query everything in J2000 and query propermotion too
+        kwargs = {} if self._tap else {'epoch': 'J2000'}
         self._query = astroquery_query(self._s.query_region,
                                        self._center,
-                                       radius=self._radius,
-                                       epoch='J2000')
+                                       radius=self._radius, **kwargs)
+        if self._tap:
+            self._query = _normalize_tap_result(self._query, self.filters)
+            coords = SkyCoord(self._query['RA'], self._query['DEC'], unit='deg')
+            order = np.argsort(coords.separation(self._center))
+            self._query = self._query[order]
         ids = np.array([string_fix(i) for i in self._query['MAIN_ID']])
         for band in self.filters:
             if self._mags_table is None:
@@ -168,7 +223,7 @@ class SimbadSourcesCatalog(_OnlineSourcesCatalog):
             self._mags_table[f'{band}_error'] = mags_error
 
         sk = SkyCoord(self._query['RA'], self._query['DEC'],
-                      unit=('hourangle', 'degree'),
+                      unit=('degree' if self._tap else 'hourangle', 'degree'),
                       pm_ra_cosdec=self._query['PMRA'],
                       pm_dec=self._query['PMDEC'],
                       obstime='J2000.0', frame='icrs')

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/vizier.py

@@ -68,6 +68,10 @@ class VizierSourcesCatalog(_OnlineSourcesCatalog):
         self._table = self._conf['table']
         self._available_filters = self._get_available_filters()
         self._columns = self._conf['columns'] + self._get_mag_columns()
+        original_names = {alias: original for original, alias in
+                          self._conf.get('column_aliases', {}).items()}
+        self._columns = [original_names.get(column, column)
+                         for column in self._columns]
 
         self._setup_catalog()
         super().__init__(*args, **kwargs)
@@ -173,6 +177,11 @@ class VizierSourcesCatalog(_OnlineSourcesCatalog):
         if len(q) == 0:
             raise RuntimeError('An error occured during online query.')
         self._query = q[0]
+        # Recent Astroquery keeps the original VizieR column names instead
+        # of converting punctuation and leading digits to underscores.
+        for original, alias in self._conf.get('column_aliases', {}).items():
+            if original in self._query.colnames and alias not in self._query.colnames:
+                self._query.rename_column(original, alias)
         ids = self._filter_ids(self._query)
 
         # perform magnitude filtering only if available
@@ -228,3 +237,4 @@ def __getattr__(name):
         NewViz.help = staticmethod(help)
         NewViz.__doc__ += VizierSourcesCatalog.__doc__
         return NewViz
+    raise AttributeError(f'module {__name__!r} has no attribute {name!r}')

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/vizier_catalogs/apass9.yml

@@ -3,6 +3,13 @@ table: 'II/336/apass9'
 bibcode: '2015AAS...22533616H'
 description: 'AAVSO Photometric All Sky Survey (APASS) DR9 (Henden+, 2016)'
 columns: ['+_r', '**']  # not so many columns
+column_aliases:
+  "g'mag": g_mag
+  "e_g'mag": e_g_mag
+  "r'mag": r_mag
+  "e_r'mag": e_r_mag
+  "i'mag": i_mag
+  "e_i'mag": e_i_mag
 available_filters: {
   'B': 'Johnson B-band magnitude',
   'V': 'Johnson V-band magnitude',

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/vizier_catalogs/twomass.yml

@@ -3,6 +3,8 @@ table: 'II/246/out'
 bibcode: '2003yCat.2246....0C'
 description: '2MASS All-Sky Catalog of Point Sources (Cutri+ 2003)'
 columns: ['+_r', '**']
+column_aliases:
+  2MASS: _2MASS
 available_filters: {
   'J': '2MASS J magnitude (1.2um)',
   'H': '2MASS H magnitude (1.6um)',

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/vizier_catalogs/ucac4.yml

@@ -2,7 +2,7 @@
 table: 'ucac4'
 description: "UCAC4 Catalogue (Zacharias+, 2012)"
 bibcode: "2012yCat.1322....0Z"
-columns: ['+_r', 'UCAC4', 'RA_ICRS', 'DE_ICRS', 'pmRA', 'pmDE', 'EpRA']
+columns: ['+_r', 'UCAC4', 'RAJ2000', 'DEJ2000', 'pmRA', 'pmDE', 'EpRA']
 available_filters: {
   'J': '2MASS J magnitude (1.2um)',
   'H': '2MASS H magnitude (1.6um)',
@@ -14,8 +14,8 @@ available_filters: {
   'i': 'i magnitude from APASS'
 }
 coordinates:
-  ra_column: 'RA_ICRS'
-  dec_column: 'DE_ICRS'
+  ra_column: 'RAJ2000'
+  dec_column: 'DEJ2000'
   pm_ra_column: 'pmRA'
   pm_dec_column: 'pmDE'
   frame: 'icrs'

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/catalogs/vizier_catalogs/ucac5.yml

@@ -2,7 +2,7 @@
 table: 'ucac5'
 bibcode: "2017yCat.1340....0Z"
 description: 'UCAC5 Catalogue (Zacharias+ 2017)'
-columns: ['+r', '**']
+columns: ['+_r', '**']
 available_filters: {
   'G': 'Gaia G magnitude',
   'R': 'Photographic R magnitude from NOMAD',
@@ -20,7 +20,7 @@ magnitudes:
   mag_column: '{band}mag'
   err_mag_column: 'e_{band}mag'
 epoch:
-  value: 'J2015.0'
+  value: 2015.0
   format: 'jyear'
 ids:
   prepend: 'Gaia'

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/image/imcombine.py

@@ -279,21 +279,21 @@ class ImCombiner:
           Maximum threshold of the clipping. `None` disables maximum masking.
           Default: `None`
         """
-        l, h = min_value, max_value
+        low, high = min_value, max_value
         # disable
-        if l is None and h is None:
+        if low is None and high is None:
             self._minmax = None
 
-        for i in (l, h):
+        for i in (low, high):
             if not check_number(i) and i is not None:
                 raise ValueError(f"{i} is not compatible with min_max "
                                  "clipping")
 
         # check if minimum is lower then maximum
-        if l is not None and h is not None:
-            l, h = sorted([l, h])
+        if low is not None and high is not None:
+            low, high = sorted([low, high])
 
-        self._minmax = (l, h)
+        self._minmax = (low, high)
 
     def set_merge_header(self, strategy, keys=None):
         """Set the strategy to merge headers during combination.

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/photometry/aperture.py

@@ -244,8 +244,9 @@ def aperture_photometry(data, x, y, r='auto', r_ann='auto',
     -------
     res_ap : `~astropy.table.Table`
         Table containing all aperture photometry informations.
+
         - ``x``, ``y``: centroids of the sources. If recentering is performed,
-            these values will be different from input.
+          these values will be different from input.
         - ``aperture``: aperture radius. Same for all sources.
         - ``flux``: flux of the sources with bkg subtracted
         - ``flux_error``: flux error of the sources with bkg subtracted
@@ -257,7 +258,9 @@ def aperture_photometry(data, x, y, r='auto', r_ann='auto',
           clipping)
         - ``flags``: flag for the sources
         - ``original_x``, ``original_y``: original input positions
+
         The metadata of the table will contain the following information:
+
         - ``photutils``: photutils version used
         - ``astropy``: astropy version used
         - ``astropop``: astropop version used
@@ -338,6 +341,8 @@ def aperture_photometry(data, x, y, r='auto', r_ann='auto',
 
     if bkg_error is None:
         bkg_error = 0.0
+    if np.ndim(bkg_error) == 0:
+        bkg_error = np.full_like(data, bkg_error, dtype=float)
 
     # Get the total error (bkg+poisson) from photutils
     # FIXME: check the gain situation

{astropop-0.9.5.dev9 → astropop-0.9.5.dev26}/astropop/photometry/detection.py

@@ -60,6 +60,7 @@ def segfind(data, threshold, background, noise, mask=None, fwhm=None, npix=5,
     sources: `astropy.table.Table`
         Table with the sources found. The table will contain the following
         columns:
+
         - ``id``: source ID
         - ``x``, ``y``: x and y coordinates of the source centroid
         - ``xcentroid``, ``ycentroid``: same as ``x`` and ``y``
@@ -234,6 +235,7 @@ def daofind(data, threshold, background, noise, fwhm,
     sources: `astropy.table.Table`
         Table with the sources found. The table will contain the following
         columns:
+
         - ``id``: source ID
         - ``x``, ``y``: x and y coordinates of the source centroid
         - ``xcentroid``, ``ycentroid``: same as ``x`` and ``y``
@@ -278,7 +280,7 @@ def daofind(data, threshold, background, noise, fwhm,
     # DaoStarFinder uses absolute threshold value
     thresh = np.median(threshold * noise)
 
-    dao = DAOStarFinder(thresh, fwhm=fwhm, sky=0,
+    dao = DAOStarFinder(thresh, fwhm=fwhm,
                         sharplo=sharplo, sharphi=sharphi,
                         roundlo=roundlo, roundhi=roundhi,
                         exclude_border=exclude_border,
@@ -369,6 +371,7 @@ def starfind(data, threshold, background, noise, fwhm=None, mask=None,
     sources: `astropy.table.Table`
         Table with the sources found. The table will contain the following
         columns:
+
         - ``id``: source ID
         - ``x``, ``y``: x and y coordinates of the source centroid
         - ``xcentroid``, ``ycentroid``: same as ``x`` and ``y``