more almanac

notebooks_tsqr/NightLog.ipynb

@@ -100,9 +100,9 @@
    "outputs": [],
    "source": [
     "# When running under Times Square, install pkg from github.\n",
-    "# Otherwise \n",
+    "# Otherwise use what is installed locally (intended to be dev editiable pkg)\n",
     "if os.environ.get('EXTERNAL_INSTANCE_URL'):\n",
-    "    !pip install git+https://github.com/lsst-ts/ts_logging_and_reporting.git@prototype \n",
+    "    !pip install git+https://github.com/lsst-ts/ts_logging_and_reporting.git@prototype >/dev/null\n",
     "import lsst.ts.logging_and_reporting.source_adapters as sad\n",
     "import lsst.ts.logging_and_reporting.almanac as alm\n",
     "#from lsst.ts.logging_and_reporting.source_adapters import ExposurelogAdapter, NarrativelogAdapter"

python/lsst/ts/logging_and_reporting/almanac.py

@@ -55,12 +55,15 @@ def as_dict(self):
             'Moon Rise': self.moon_rise_time.iso,
             'Moon Set': self.moon_set_time.iso,
             'Moon Illumination': f'{self.moon_illum:.0%}',
+
             'Astronomical Twilight (morning)': self.ast_twilight_morning.iso,
             'Astronomical Twilight (evening)': self.ast_twilight_evening.iso,
             'Nautical Twilight (morning)': self.nau_twilight_morning.iso,
             'Nautical Twilight (evening)': self.nau_twilight_evening.iso,
             'Civil Twilight (morning)': self.civ_twilight_morning.iso,
             'Civil Twilight (evening)': self.civ_twilight_evening.iso,
+            'Sun Rise': self.sun_rise_time.iso,
+            'Sun Set': self.sun_set_time.iso,
             }
         help_dict = {
             'Moon Rise': '',
@@ -72,5 +75,7 @@ def as_dict(self):
             'Nautical Twilight (evening)': '(-12 degrees)',
             'Civil Twilight (morning)': '(-6 degrees)',
             'Civil Twilight (evening)': '(-6 degrees)',
+            'Sun Rise': '',
+            'Sun Set': '',
             }
         return data_dict, help_dict