wintertoo 1.7.1__py3-none-any.whl → 1.8.0__py3-none-any.whl

wintertoo/data/__init__.py

@@ -56,6 +56,6 @@ def get_default_value(key: str):
 
 
 # define location of Palomar Observatory
-PALOMAR_LOC = coords.EarthLocation.of_site("Palomar")
+PALOMAR_LOC = coords.EarthLocation.of_site("Palomar", refresh_cache=True)
 
 palomar_observer = astroplan.Observer(location=PALOMAR_LOC)

wintertoo/utils.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """
 Created on Tue Jan 25 13:51:59 2022
-@author: frostig, belatedly edited by Robert Stein
+@author: frostig, belatedly edited by Robert Stein, further belatedly edited by Sam Rose
 """
 import logging
 
@@ -38,6 +38,54 @@ def get_alt_az(times_mjd: list, ra: float, dec: float) -> tuple:
     return alt_array, az_array
 
 
+def get_night_times(time_mjd: astropy.time.Time):
+    """
+    Get an array of times which cover the night of the date given.
+
+    Parameters
+    ----------
+    time_mjd : astropy.time.Time
+        date in MJD (median Julian Date), e.g. 59480 (Sept 23)
+
+    Returns
+    -------
+    time_array : numpy array
+        array of times during the night
+
+    """
+    time = Time(time_mjd, format="mjd")
+
+    # Rise/fade can fail if target is close to a bin edge
+    sun_rise_next = palomar_observer.sun_rise_time(time, which="next")
+    sun_set_next = palomar_observer.sun_set_time(time, which="next")
+    sun_set_prev = palomar_observer.sun_set_time(time, which="previous")
+
+    if isinstance(sun_rise_next.value, Masked):
+        sun_rise_next = palomar_observer.sun_rise_time(
+            time - 0.05 * u.day, which="next"
+        )
+
+    if isinstance(sun_set_next.value, Masked):
+        sun_set_next = palomar_observer.sun_set_time(time - 0.05 * u.day, which="next")
+
+    if isinstance(sun_set_prev.value, Masked):
+        sun_set_prev = palomar_observer.sun_set_time(
+            time + 0.05 * u.day, which="previous"
+        )
+
+    until_next_sunset = sun_set_next.jd - time.jd
+    until_next_sunrise = sun_rise_next.jd - time.jd
+
+    if until_next_sunrise < until_next_sunset:
+        # this is the case where time is during the night
+        time_array = np.linspace(sun_set_prev.jd, sun_rise_next.jd, 100)
+    else:
+        # this is the case where time is during the day
+        time_array = np.linspace(sun_set_next.jd, sun_rise_next.jd, 100)
+
+    return time_array
+
+
 def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, str]:
     """
     what is up (above altitude 20 deg) in a given night?
@@ -50,23 +98,9 @@ def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, st
     :return:
     """
     loc = SkyCoord(ra=ra, dec=dec, frame="icrs")
+    time_array = get_night_times(time_mjd)
     time = Time(time_mjd, format="mjd")
 
-    # Rise/fade can fail if target is close to a bin edge
-    sun_rise = palomar_observer.sun_rise_time(time, which="previous")
-    if isinstance(sun_rise.value, Masked):
-        sun_rise = palomar_observer.sun_rise_time(time - 0.05 * u.day, which="previous")
-    sun_set = palomar_observer.sun_set_time(time, which="next")
-    if isinstance(sun_rise.value, Masked):
-        sun_set = palomar_observer.sun_rise_time(time + 0.05 * u.day, which="next")
-
-    night = sun_set.jd - sun_rise.jd
-    if night >= 1:
-        # if next day, subtract a day
-        time_array = np.linspace(sun_set.jd, sun_set.jd + (night - 1), 100)
-    else:
-        time_array = np.linspace(sun_set.jd, sun_set.jd + night, 100)
-
     altaz = loc.transform_to(
         AltAz(obstime=Time(time_array, format="jd"), location=PALOMAR_LOC)
     )
@@ -81,12 +115,21 @@ def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, st
             pass
 
     if time_up > 0:
-        is_available = (
-            f"Object is up between UTC "
-            f'{Time(df["time"].iloc[0], format="jd").isot} '
-            f'and {Time(df["time"].iloc[-1], format="jd").isot}'
-        )
-        avail_bool = True
+        if time.jd > df["time"].iloc[-1]:
+            is_available = (
+                f"Object is up between UTC "
+                f'{Time(df["time"].iloc[0]+1, format="jd").isot} '
+                f'and {Time(df["time"].iloc[-1]+1, format="jd").isot}'
+            )
+            avail_bool = True
+
+        else:
+            is_available = (
+                f"Object is up between UTC "
+                f'{Time(df["time"].iloc[0], format="jd").isot} '
+                f'and {Time(df["time"].iloc[-1], format="jd").isot}'
+            )
+            avail_bool = True
     else:
         is_available = "Object is not up"
         avail_bool = False

{wintertoo-1.7.1.dist-info → wintertoo-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: wintertoo
-Version: 1.7.1
+Version: 1.8.0
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo
@@ -22,23 +22,23 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
-Requires-Dist: astropy >=6.0.0
-Requires-Dist: astroplan >=0.10
+Requires-Dist: astropy>=6.0.0
+Requires-Dist: astroplan>=0.10
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pytz
 Requires-Dist: jsonschema
 Requires-Dist: sqlalchemy
-Requires-Dist: pydantic >=2.2.0
+Requires-Dist: pydantic>=2.2.0
 Requires-Dist: pre-commit
 Requires-Dist: bcrypt
 Requires-Dist: psycopg
 Requires-Dist: psycopg-binary
 Provides-Extra: dev
-Requires-Dist: black >=24.1.0 ; extra == 'dev'
-Requires-Dist: isort >=5.13.0 ; extra == 'dev'
-Requires-Dist: pylint >=3.0.0 ; extra == 'dev'
-Requires-Dist: coveralls ; extra == 'dev'
+Requires-Dist: black>=24.1.0; extra == "dev"
+Requires-Dist: isort>=5.13.0; extra == "dev"
+Requires-Dist: pylint>=3.0.0; extra == "dev"
+Requires-Dist: coveralls; extra == "dev"
 
 # wintertoo
 [![PyPI version](https://badge.fury.io/py/wintertoo.svg)](https://badge.fury.io/py/wintertoo)

{wintertoo-1.7.1.dist-info → wintertoo-1.8.0.dist-info}/RECORD

@@ -4,9 +4,9 @@ wintertoo/errors.py,sha256=iAFcy0z3A3bCnkJmAt_P-77fPaPHFGS1JbrK6O2dCEM,223
 wintertoo/fields.py,sha256=TDSOwJeR4UvfzKQCaIqoPLv0hSU_73TZwQcZ2FbnO8Q,6029
 wintertoo/schedule.py,sha256=xYQ7tp5Yjg3gi65dAMqfILPEnJOc6GU-GmwhCVSl_Nc,5790
 wintertoo/submit.py,sha256=2Z3MgL7uYAj8KJaeTDoEMd1w5dk_BEH-Uqm6cniVzus,3194
-wintertoo/utils.py,sha256=B3TxnMUzJi05jYqfAuPnZ2gTzYHWzKlK6KW6CHjvbLc,3274
+wintertoo/utils.py,sha256=3UcES0qntC-gR96lmwzMq9KB9_DjDEgB-ITFM65Aslg,4561
 wintertoo/validate.py,sha256=RfgCnsJrx9GUSgE_WjxT1MhZfsg0AE-58ROMnhS-RKk,10424
-wintertoo/data/__init__.py,sha256=X4VXM59gawC6FALWeaA2DfO3TiYvluQCp2UuLNKTSvM,1665
+wintertoo/data/__init__.py,sha256=6y0GEJllhlEO7yFQ_PmKZ_56rgMt25l7d6mRSmN9o_A,1685
 wintertoo/data/observing_request_schema.json,sha256=HyPcP2ABRDdPmgdnPX4XP4H97DhnSqVhHUk9uDmUnos,1708
 wintertoo/data/summer_fields.txt,sha256=5Sc7MBUacelzaq1KHSLmfAyZ3WB5YifMNwKRjBRBcRk,52684603
 wintertoo/data/winter_fields.txt,sha256=d2arp06H9Cy801YqnQy9AaEk4AoNF-Hg0xAwlqv2fgE,3193011
@@ -14,8 +14,8 @@ wintertoo/models/__init__.py,sha256=c2GEbIHvOT34IhpiMyqA7Tn83hEmnwx6Q7BuxURp97k,
 wintertoo/models/image.py,sha256=VdlyF_goBMzmAmMHSIevEbheQOLMzFdxz10AK5Wwmqw,4066
 wintertoo/models/program.py,sha256=mtewVnt7NxSK0hxX8aUO8qehEtOi_Cieli4voCCRh4I,1804
 wintertoo/models/too.py,sha256=-gFig0Zp_QgSrbgpZkx3dQU70Fxko218QUCQp5uptxE,7338
-wintertoo-1.7.1.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
-wintertoo-1.7.1.dist-info/METADATA,sha256=rVUufmhbuhWFWOPQtcSI80tU4K4bWOpdFUNjRbVQUNw,2513
-wintertoo-1.7.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-wintertoo-1.7.1.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
-wintertoo-1.7.1.dist-info/RECORD,,
+wintertoo-1.8.0.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
+wintertoo-1.8.0.dist-info/METADATA,sha256=fBZo0U2URqbRD73_mJRCl65TrBZ78ksnnH7ymIC42_M,2503
+wintertoo-1.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wintertoo-1.8.0.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
+wintertoo-1.8.0.dist-info/RECORD,,

{wintertoo-1.7.1.dist-info → wintertoo-1.8.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any