Merge pull request #92 from WWGolay/schedtel-dev

Development progress on schedtel
macro-consortium · Dec 19, 2023 · 3bfb7d2 · 3bfb7d2
2 parents f0a2f4c + 8a08345
commit 3bfb7d2
Show file tree

Hide file tree

Showing 30 changed files with 6,199 additions and 3,461 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -32,7 +32,7 @@
                 }
             }
         }
-        
+
     },
     "features": {
         "ghcr.io/devcontainers/features/github-cli:1": {}

diff --git a/README.rst b/README.rst
@@ -6,6 +6,9 @@ pyscope
 
     |License| |Zenodo| |PyPI Version| |PyPI Python Versions| |PyPI Downloads| |Astropy| |GitHub CI| |Code Coverage| |Documentation Status| |Codespaces Status| |pre-commit| |Black| |isort| |Donate|
 
+.. image:: https://github.com/WWGolay/pyscope/blob/main/docs/source/images/pyscope_logo_white.png
+    :alt: pyscope logo
+
 This is the repository for `pyscope <https://pyscope.readthedocs.io/en/latest/>`_,
 a pure-Python package for robotic scheduling, operation, and control of small
 optical telescopes.

diff --git a/coverage.xml b/coverage.xml
diff --git a/docs/source/images/old/pyscope_banner.png → docs/source/_static/old/pyscope_banner.png b/docs/source/images/old/pyscope_banner.png → docs/source/_static/old/pyscope_banner.png
diff --git a/...source/images/old/pyscope_transparent.svg → ...ource/_static/old/pyscope_transparent.svg b/...source/images/old/pyscope_transparent.svg → ...ource/_static/old/pyscope_transparent.svg
diff --git a/docs/source/images/pyscope_logo.png → docs/source/_static/pyscope_logo.png b/docs/source/images/pyscope_logo.png → docs/source/_static/pyscope_logo.png
diff --git a/docs/source/images/pyscope_logo.svg → docs/source/_static/pyscope_logo.svg b/docs/source/images/pyscope_logo.svg → docs/source/_static/pyscope_logo.svg
diff --git a/docs/source/images/pyscope_logo_small.svg → docs/source/_static/pyscope_logo_small.svg b/docs/source/images/pyscope_logo_small.svg → docs/source/_static/pyscope_logo_small.svg
diff --git a/...source/images/pyscope_logo_small_gray.svg → ...ource/_static/pyscope_logo_small_gray.svg b/...source/images/pyscope_logo_small_gray.svg → ...ource/_static/pyscope_logo_small_gray.svg
diff --git a/docs/source/images/pyscope_logo_white.png → docs/source/_static/pyscope_logo_white.png b/docs/source/images/pyscope_logo_white.png → docs/source/_static/pyscope_logo_white.png
diff --git a/docs/source/images/pyscope_logo_white.svg → docs/source/_static/pyscope_logo_white.svg b/docs/source/images/pyscope_logo_white.svg → docs/source/_static/pyscope_logo_white.svg
diff --git a/docs/source/images/pyscope_logo_small.png b/docs/source/images/pyscope_logo_small.png
diff --git a/docs/source/images/pyscope_logo_small_gray.png b/docs/source/images/pyscope_logo_small_gray.png
diff --git a/pyscope/__init__.py b/pyscope/__init__.py
@@ -76,7 +76,7 @@
 
 import logging
 
-__version__ = "0.1.5"
+__version__ = "0.1.6"
 
 from . import utils
 from . import observatory

diff --git a/pyscope/observatory/observatory.py b/pyscope/observatory/observatory.py
@@ -1156,12 +1156,13 @@ def save_last_image(
         do_fwhm=False,
         overwrite=False,
         custom_header=None,
+        history=None,
         **kwargs,
     ):
         """Saves the current image"""
 
         logger.debug(
-            f"Observatory.save_last_image({filename}, {frametyp}, {do_wcs}, {do_fwhm}, {overwrite}, {custom_header}, {kwargs}) called"
+            f"Observatory.save_last_image({filename}, {frametyp}, {do_wcs}, {do_fwhm}, {overwrite}, {custom_header}, {history}, {kwargs}) called"
         )
 
         if not self.camera.ImageReady:
@@ -1217,6 +1218,12 @@ def save_last_image(
         if custom_header is not None:
             hdr.update(custom_header)
 
+        if history is not None:
+            if type(history) is str:
+                history = [history]
+            for hist in history:
+                hdr["HISTORY"] = hist
+
         hdu = fits.PrimaryHDU(self.camera.ImageArray, header=hdr)
         hdu.writeto(filename, overwrite=overwrite)
 

diff --git a/pyscope/reduction/calib_images.py b/pyscope/reduction/calib_images.py
@@ -11,7 +11,6 @@
 from ..observatory import AstrometryNetWCS
 from .ccd_calib import ccd_calib
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/pyscope/telrun/__init__.py b/pyscope/telrun/__init__.py
@@ -13,10 +13,13 @@
 from .init_dirs import init_telrun_dir, init_remote_dir
 from .mk_mosaic_schedule import mk_mosaic_schedule
 from .rst import rst
-from .schedtel import schedtel, plot_schedule_gantt, parse_sch_file
+from . import sch
+from . import schedtab
+from .schedtel import schedtel, plot_schedule_gantt, plot_schedule_sky
 from .startup import start_telrun, start_syncfiles
-from .summary_report import summary_report
+from . import reports
 from .syncfiles import syncfiles
+from .telrun_block import TelrunBlock
 from .telrun_operator import TelrunOperator
 
 __all__ = [
@@ -25,13 +28,15 @@
     "init_remote_dir",
     "mk_mosaic_schedule",
     "rst",
+    "sch",
+    "schedtab",
     "schedtel",
     "plot_schedule_gantt",
-    "parse_sch_file",
     "start_telrun",
     "start_syncfiles",
-    "summary_report",
+    "reports",
     "syncfiles",
+    "TelrunBlock",
     "TelrunOperator",
     "TelrunException",
 ]
diff --git a/pyscope/telrun/summary_report.py → pyscope/telrun/reports.py b/pyscope/telrun/summary_report.py → pyscope/telrun/reports.py
@@ -401,4 +401,10 @@ def summary_report_cli(
         )
 
 
+@click.command()
+def schedule_report_cli():
+    pass
+
+
 summary_report = summary_report_cli.callback
+schedule_report = schedule_report_cli.callback