Skip to content

Fix passing of groupbadpix keyword #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci_cron_weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install language-pack-de and tzdata
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install language-pack-de and tzdata
Expand Down Expand Up @@ -106,11 +106,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install language-pack-de and tzdata
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Legal
.. _`IDL®`: https://www.nv5geospatialsoftware.com/Products/IDL
.. _idlutils: https://www.sdss4.org/dr16/software/idlutils/
.. _SDSS: https://www.sdss.org
.. _`Goddard utilities`: https://idlastro.gsfc.nasa.gov/
.. _`Goddard utilities`: https://asd.gsfc.nasa.gov/archive/idlastro/
.. _idlspec2d: https://svn.sdss.org/public/repo/eboss/idlspec2d/trunk/
.. _BOSS: https://www.sdss4.org/surveys/boss/
.. _eBOSS: https://www.sdss4.org/surveys/eboss/
Expand Down
6 changes: 5 additions & 1 deletion docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ PyDL Changelog
1.0.1 (unreleased)
------------------

* No changes yet.
* Allow the ``groupbadpix`` keyword to be passed to
:func:`~pydl.pydlutils.math.djs_reject`; refactor of
:func:`~pydl.pydlutils.math.djs_median`; test infrastructure updates (PR `#78`_).

.. _`#78`: https://github.com/weaverba137/pydl/pull/78

1.0.0 (2024-01-02)
------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/goddard.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ structure NA Tools for manipulating IDL data structures. Use :c
tv NA Functions for manipulating IDL image displays.
============= =============== ===================================================

.. _`The IDL® Astronomy User's Libary`: https://idlastro.gsfc.nasa.gov/
.. _`The IDL® Astronomy User's Libary`: https://asd.gsfc.nasa.gov/archive/idlastro/
.. _idlutils: https://www.sdss4.org/dr16/software/idlutils/
.. _`Coyote library`: http://www.idlcoyote.com/
.. _`Functions from the JHU Applied Physics Lab`: https://fermi.jhuapl.edu/s1r/idl/idl.html
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Base API
.. _`IDL®`: https://www.nv5geospatialsoftware.com/Products/IDL
.. _idlutils: https://www.sdss4.org/dr16/software/idlutils/
.. _SDSS: https://www.sdss.org
.. _`Goddard utilities`: https://idlastro.gsfc.nasa.gov/
.. _`Goddard utilities`: https://asd.gsfc.nasa.gov/archive/idlastro/
.. _idlspec2d: https://svn.sdss.org/public/repo/eboss/idlspec2d/trunk/
.. _BOSS: https://www.sdss4.org/surveys/boss/
.. _eBOSS: https://www.sdss4.org/surveys/eboss/
Expand Down
8 changes: 4 additions & 4 deletions docs/notebooks/Vacuum Wavelength Conversions.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/pydlspec2d.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ API
.. automodapi:: pydl.pydlspec2d

.. automodapi:: pydl.pydlspec2d.spec1d
:skip: warn, solve, Pydlspec2dException, Pydlspec2dUserWarning, FontProperties
:skip: warn, solve, Pydlspec2dException, Pydlspec2dUserWarning, FontProperties, WCS, Time

.. automodapi:: pydl.pydlspec2d.spec2d
:skip: warn, erf, get_pkg_data_filename, smooth, iterfit, djs_maskinterp, djs_median, sdss_flagval, traceset2xy, xy2traceset, vactoair
2 changes: 1 addition & 1 deletion docs/pydlutils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ yanny Good Tools for manipulating `SDSS parameter files`_.

.. _idlutils: https://www.sdss4.org/dr16/software/idlutils/
.. _SDSS: https://www.sdss.org
.. _`The IDL® Astronomy User's Libary`: https://idlastro.gsfc.nasa.gov/
.. _`The IDL® Astronomy User's Libary`: https://asd.gsfc.nasa.gov/archive/idlastro/
.. _healpy: https://healpy.readthedocs.io/en/latest/
.. _bitmasks: https://www.sdss4.org/dr16/algorithms/bitmasks/
.. _`sweep files`: https://data.sdss.org/datamodel/files/PHOTO_SWEEP/RERUN/calibObj.html
Expand Down
8 changes: 7 additions & 1 deletion pydl/photoop/photoobj.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ def unwrap_objid(objid):
rec.array([(2, 301, 3704, 3, 0, 91, 146)],
dtype=[('skyversion', '<i4'), ('rerun', '<i4'), ('run', '<i4'), ('camcol', '<i4'), ('firstfield', '<i4'), ('frame', '<i4'), ('id', '<i4')])
"""
if objid.dtype.type is np.string_ or objid.dtype.type is np.unicode_:
try:
np_string = np.string_ # Numpy 1.x
np_unicode = np.unicode_
except AttributeError:
np_string = np.bytes_ # Numpy 2.x
np_unicode = np.str_
if objid.dtype.type is np_string or objid.dtype.type is np_unicode:
tempobjid = objid.astype(np.int64)
elif objid.dtype.type is np.int64:
tempobjid = objid.copy()
Expand Down
Loading
Loading