Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
99c816d
WIP: Making `dfocus` more pythonic
tbowers7 Jan 9, 2025
f4ee500
Add dfocus files for testing
tbowers7 Feb 6, 2025
d58188e
Adding tests for dfocus
tbowers7 Feb 7, 2025
8b6dc41
Upgrade from `numpy.poly1d` to `numpy.polynomial`
tbowers7 Feb 7, 2025
c66036d
Introduce ``DataClass`` infrastructure
tbowers7 Apr 22, 2025
2afd5e7
More dfocus testing
tbowers7 Apr 23, 2025
a7aa41c
More DRY consolidation in ``dfocus.py``
tbowers7 Apr 23, 2025
4daf352
Testing data needed for CI tests?
tbowers7 Apr 23, 2025
20b038c
Allow NumPy 2.0
tbowers7 May 13, 2025
c7aac14
Allow Python 3.13
tbowers7 May 14, 2025
b0660b3
Starting PyQt6 LMI ETC GUI
tbowers7 Jul 12, 2025
1570193
Clean up code
tbowers7 Jul 15, 2025
7183b45
Add LMI ETC default values, background paper
tbowers7 Jul 15, 2025
8943651
Update docs
tbowers7 Jul 15, 2025
5093ae9
First pass at LMI ETC GUI
tbowers7 Jul 16, 2025
58a5a8b
Further improvement of the LMI ETC GUI
tbowers7 Jul 17, 2025
37fe88a
LMI ETC GUI is populated -- now to the plumbing
tbowers7 Jul 17, 2025
49f4bb7
LMI ETC Computation works!!!
tbowers7 Jul 17, 2025
8049ed4
LMI ETC calculations match Phil's PHP code
tbowers7 Jul 18, 2025
a2ca224
Add UI for ETC table view window
tbowers7 Jul 18, 2025
5fff0f8
Moving things around
tbowers7 Jul 18, 2025
e01ec83
Add Makefile to generate *.py files from Qt *.ui
tbowers7 Jul 18, 2025
9cd2582
LMI ETC data table not quite populating
tbowers7 Jul 18, 2025
a4f5038
Progress at the end of a Friday
tbowers7 Jul 19, 2025
b551145
LMI ETC saves table data appropriately formatted
tbowers7 Jul 21, 2025
9f9da2c
Make LMI ETC GUI pretty
tbowers7 Jul 21, 2025
f1723bd
Fix making pretty
tbowers7 Jul 22, 2025
cbfcb90
LMI ETC unit tests complete
tbowers7 Jul 22, 2025
45603cf
Finished the dfocus unit tests
tbowers7 Jul 22, 2025
4edb9b4
Bug fixes and testing
tbowers7 Jul 22, 2025
8a3a4fa
Merge pull request #48 from LowellObservatory/dfocus_work
tbowers7 Jul 22, 2025
18aabce
Merge pull request #49 from LowellObservatory/main
tbowers7 Jul 22, 2025
827ddea
Attempt to get the ChangeLog action to work
tbowers7 Jul 22, 2025
1445f73
Merge branch 'develop' into lmi_etc
tbowers7 Jul 22, 2025
dbc41f5
Merge pull request #51 from LowellObservatory/admin
tbowers7 Jul 22, 2025
435d87c
Force unicode read on astropy ECSV table
tbowers7 Jul 22, 2025
3d29fe5
Install `freeglut3-dev` for ubuntu / split CI
tbowers7 Jul 22, 2025
e4d65a8
Remove support for Python 3.10
tbowers7 Jul 23, 2025
f0ab0cd
Update doc
tbowers7 Jul 23, 2025
2e2a620
Merge branch 'develop' into lmi_etc
tbowers7 Jul 23, 2025
d38a0cf
Add LMI ETC documentation
tbowers7 Jul 23, 2025
ada07f6
Cleaning makefiles
tbowers7 Jul 23, 2025
3a24972
Update help versions ahead of tag
tbowers7 Jul 23, 2025
bc3e888
Merge pull request #50 from LowellObservatory/lmi_etc
tbowers7 Jul 23, 2025
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
14 changes: 10 additions & 4 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ jobs:
os:
- ubuntu-latest
python:
- "3.11"
- "3.12"
- "3.13"
toxenv:
- test-numpydev
- test-astropydev
Expand All @@ -42,13 +44,15 @@ jobs:
python-version: ${{ matrix.python }}
- name: Install base dependencies
run: |
sudo apt-get install -y freeglut3-dev
python -m pip install --upgrade pip tox
- name: Test with tox
run: |
tox -e ${{ matrix.python }}-${{ matrix.toxenv }}
- name: Upload coverage to codecov
if: "endsWith(matrix.tox_env, '-cov')"
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3

os-tests:
name: Python ${{ matrix.python }} on ${{ matrix.os }}
permissions:
Expand All @@ -61,11 +65,10 @@ jobs:
os:
- windows-latest
- macos-latest
- ubuntu-latest
python:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
toxenv:
- test
- test-alldeps
Expand All @@ -82,6 +85,7 @@ jobs:
- name: Test with tox
run: |
tox -e ${{ matrix.python }}-${{ matrix.toxenv }}

conda:
runs-on: ubuntu-latest
permissions:
Expand All @@ -92,13 +96,15 @@ jobs:
- name: Conda environment check
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.13"
- name: Install base dependencies
run: |
sudo apt-get install -y freeglut3-dev
python -m pip install --upgrade pip tox
- name: Run obstools tests from environment built with conda
run: |
tox -e conda

codestyle:
permissions:
contents: read
Expand All @@ -109,7 +115,7 @@ jobs:
- name: Python codestyle check
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.13"
- name: Install base dependencies
run: |
python -m pip install --upgrade pip
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
jobs:
update:
permissions:
contents: read
contents: read, write
pages: write
pull-requests: write
runs-on: ubuntu-latest

Expand Down
13 changes: 13 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

# Remove directories
prune .github
prune doc

# Remove file types
global-exclude *.pyc *.o *.so *.DS_Store *.ipynb

# Remove testing data
# recursive-exclude obstools/tests/files *.fits *.json *.pdf *.tar.gz

# Remove individual files
exclude .gitignore
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SUBDIRS = obstools

.PHONY: all $(SUBDIRS)

all: $(SUBDIRS)

$(SUBDIRS):
$(MAKE) -C $@
16 changes: 13 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ List of Programs
Tools Contained in this Package:
--------------------------------

- LMI exposure time calculator (``lmi_etc``)

- DeVeny Spectrograph grating angle calculator (``deveny_grangle``)

- DeVeny Spectrograph collimator focus sequence estimator (``deveny_collfocus``)
Expand All @@ -104,7 +106,15 @@ Tools Contained in this Package:
Future Tools (planned or in development):
-----------------------------------------

- LMI exposure time calculator (``lmi_etc``)
- DeVeny Spectrograph exposure time calculator (``deveny_etc``)

- RIMAS exposure time calculator (``rimas_etc``)

- DeVeny Spectrograph Quick-Look tool (``deveny_ql``)

- RIMAS Imaging Quick-Look tool (``rimas_image_ql``)

- RIMAS Spectroscopic Quick-Look tool (``rimas_spec_ql``)

- NEO Confirmation Page ephemeris generator (``neocp_ephem``)

Expand Down Expand Up @@ -134,7 +144,7 @@ The recommended method of setting up a new environment is with ``conda``:

.. code-block:: console

conda create -n obstools python=3.11
conda create -n obstools python=3.13
conda activate obstools

See `Managing Environments with Conda
Expand All @@ -149,7 +159,7 @@ Installing LDTObserverTools via ``pip``
.. note::
The commands here assume ``pip`` is associated with Python3. To check, run
``pip --version`` from the command line and check that the associated python
version is ``>= 3.10``.
version is ``>= 3.11``.

Also, you will need ``git`` installed on your system / in your environment.

Expand Down
4 changes: 2 additions & 2 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXAPI = sphinx-apidoc
SPHINXAPIOPT = members,private-members,undoc-members,show-inheritance
SPHINXAPIOPT = members,private-members,undoc-members,show-inheritance,no-index
SPHINXOPTS = -aE -w ./sphinx_warnings.out
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build
LOCALFILES = $(BUILDDIR)/* api/*.rst help/*.rst sphinx_warnings.out pypeit_par.rst
LOCALFILES = $(BUILDDIR)/* api/*.rst help/*.rst sphinx_warnings.out

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
Expand Down
6 changes: 6 additions & 0 deletions doc/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.math {
text-align: left;
}
.eqno {
float: right;
}
3 changes: 2 additions & 1 deletion doc/api/obstools.broker_listener.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.broker\_listener module

.. automodule:: obstools.broker_listener
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.celestial_time.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.celestial\_time module

.. automodule:: obstools.celestial_time
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.deveny_collfocus.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.deveny\_collfocus module

.. automodule:: obstools.deveny_collfocus
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.deveny_grangle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.deveny\_grangle module

.. automodule:: obstools.deveny_grangle
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.dfocus.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.dfocus module

.. automodule:: obstools.dfocus
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.fix_ldt_header.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.fix\_ldt\_header module

.. automodule:: obstools.fix_ldt_header
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.lmi_etc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.lmi\_etc module

.. automodule:: obstools.lmi_etc
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.neocp_ephem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.neocp\_ephem module

.. automodule:: obstools.neocp_ephem
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Module contents

.. automodule:: obstools
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.scrub_deveny_pickup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.scrub\_deveny\_pickup module

.. automodule:: obstools.scrub_deveny_pickup
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
4 changes: 3 additions & 1 deletion doc/api/obstools.tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ Submodules
obstools.tests.test_dfocus
obstools.tests.test_lmi_etc
obstools.tests.test_utils
obstools.tests.tstutlis

Module contents
---------------

.. automodule:: obstools.tests
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.tests.test_celestial_time.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.tests.test\_celestial\_time module

.. automodule:: obstools.tests.test_celestial_time
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.tests.test_deveny_grangle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.tests.test\_deveny\_grangle module

.. automodule:: obstools.tests.test_deveny_grangle
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.tests.test_dfocus.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.tests.test\_dfocus module

.. automodule:: obstools.tests.test_dfocus
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.tests.test_lmi_etc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.tests.test\_lmi\_etc module

.. automodule:: obstools.tests.test_lmi_etc
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.tests.test_utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.tests.test\_utils module

.. automodule:: obstools.tests.test_utils
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
9 changes: 9 additions & 0 deletions doc/api/obstools.tests.tstutlis.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
obstools.tests.tstutlis module
==============================

.. automodule:: obstools.tests.tstutlis
:members:
:no-index:
:private-members:
:show-inheritance:
:undoc-members:
3 changes: 2 additions & 1 deletion doc/api/obstools.utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obstools.utils module

.. automodule:: obstools.utils
:members:
:no-index:
:private-members:
:undoc-members:
:show-inheritance:
:undoc-members:
6 changes: 4 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
# -- Project information -----------------------------------------------------

project = "LDT Observer Tools"
copyright = "2023, Lowell Observatory"
copyright = "2023-2025, Lowell Observatory"
author = "T. Ellsworth-Bowers"

# The full version, including alpha/beta/rc tags
release = "2023"
release = "2025"


# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -136,3 +136,5 @@
"pypeit": ("https://pypeit.readthedocs.io/en/release/", None),
"stomp": ("https://jasonrbriggs.github.io/stomp.py/", None),
}

html_css_files = ["css/custom.css"]
23 changes: 23 additions & 0 deletions doc/deveny_etc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.. include:: include/links.rst

.. |nbsp| unicode:: 0xA0
:trim:

.. _deveny_etc:

===============================
DeVeny Exposure Time Calculator
===============================

Status: *Planned -- to be folded into a combined DeVeny GUI Tool*

Overview
========

- ``deveny_etc``: Exposure time calculator based on the equations in the DeVeny Manual.


Usage
=====

Usage information will be added here once this tool enters development.
Binary file added doc/figures/lmi_etc_blank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/figures/lmi_etc_compute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/figures/lmi_etc_table.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion doc/help/deveny_collfocus.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
options:
-h, --help show this help message and exit

LDT Observer Tools (obstools) version 0.6.7
LDT Observer Tools (obstools) version 0.7.0

Loading
Loading