Skip to content

Commit 3bfb7d2

Browse files
authored
Merge pull request #92 from WWGolay/schedtel-dev
Development progress on schedtel
2 parents f0a2f4c + 8a08345 commit 3bfb7d2

30 files changed

+6199
-3461
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333
}
3434
}
35-
35+
3636
},
3737
"features": {
3838
"ghcr.io/devcontainers/features/github-cli:1": {}

README.rst

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ pyscope
66

77
|License| |Zenodo| |PyPI Version| |PyPI Python Versions| |PyPI Downloads| |Astropy| |GitHub CI| |Code Coverage| |Documentation Status| |Codespaces Status| |pre-commit| |Black| |isort| |Donate|
88

9+
.. image:: https://github.com/WWGolay/pyscope/blob/main/docs/source/images/pyscope_logo_white.png
10+
:alt: pyscope logo
11+
912
This is the repository for `pyscope <https://pyscope.readthedocs.io/en/latest/>`_,
1013
a pure-Python package for robotic scheduling, operation, and control of small
1114
optical telescopes.

coverage.xml

+3,389-2,650
Large diffs are not rendered by default.
-24.2 KB
Binary file not shown.
-27.3 KB
Binary file not shown.

pyscope/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
import logging
7878

79-
__version__ = "0.1.5"
79+
__version__ = "0.1.6"
8080

8181
from . import utils
8282
from . import observatory

pyscope/observatory/observatory.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -1156,12 +1156,13 @@ def save_last_image(
11561156
do_fwhm=False,
11571157
overwrite=False,
11581158
custom_header=None,
1159+
history=None,
11591160
**kwargs,
11601161
):
11611162
"""Saves the current image"""
11621163

11631164
logger.debug(
1164-
f"Observatory.save_last_image({filename}, {frametyp}, {do_wcs}, {do_fwhm}, {overwrite}, {custom_header}, {kwargs}) called"
1165+
f"Observatory.save_last_image({filename}, {frametyp}, {do_wcs}, {do_fwhm}, {overwrite}, {custom_header}, {history}, {kwargs}) called"
11651166
)
11661167

11671168
if not self.camera.ImageReady:
@@ -1217,6 +1218,12 @@ def save_last_image(
12171218
if custom_header is not None:
12181219
hdr.update(custom_header)
12191220

1221+
if history is not None:
1222+
if type(history) is str:
1223+
history = [history]
1224+
for hist in history:
1225+
hdr["HISTORY"] = hist
1226+
12201227
hdu = fits.PrimaryHDU(self.camera.ImageArray, header=hdr)
12211228
hdu.writeto(filename, overwrite=overwrite)
12221229

pyscope/reduction/calib_images.py

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from ..observatory import AstrometryNetWCS
1212
from .ccd_calib import ccd_calib
1313

14-
1514
logger = logging.getLogger(__name__)
1615

1716

pyscope/telrun/__init__.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313
from .init_dirs import init_telrun_dir, init_remote_dir
1414
from .mk_mosaic_schedule import mk_mosaic_schedule
1515
from .rst import rst
16-
from .schedtel import schedtel, plot_schedule_gantt, parse_sch_file
16+
from . import sch
17+
from . import schedtab
18+
from .schedtel import schedtel, plot_schedule_gantt, plot_schedule_sky
1719
from .startup import start_telrun, start_syncfiles
18-
from .summary_report import summary_report
20+
from . import reports
1921
from .syncfiles import syncfiles
22+
from .telrun_block import TelrunBlock
2023
from .telrun_operator import TelrunOperator
2124

2225
__all__ = [
@@ -25,13 +28,15 @@
2528
"init_remote_dir",
2629
"mk_mosaic_schedule",
2730
"rst",
31+
"sch",
32+
"schedtab",
2833
"schedtel",
2934
"plot_schedule_gantt",
30-
"parse_sch_file",
3135
"start_telrun",
3236
"start_syncfiles",
33-
"summary_report",
37+
"reports",
3438
"syncfiles",
39+
"TelrunBlock",
3540
"TelrunOperator",
3641
"TelrunException",
3742
]

pyscope/telrun/summary_report.py renamed to pyscope/telrun/reports.py

+6
Original file line numberDiff line numberDiff line change
@@ -401,4 +401,10 @@ def summary_report_cli(
401401
)
402402

403403

404+
@click.command()
405+
def schedule_report_cli():
406+
pass
407+
408+
404409
summary_report = summary_report_cli.callback
410+
schedule_report = schedule_report_cli.callback

0 commit comments

Comments
 (0)