Changing Windows -> Ranges to comply with API updates

astroplan/core.py

@@ -3,11 +3,12 @@
                         unicode_literals)
 
 from astropy.coordinates import (EarthLocation, Latitude, Longitude, SkyCoord,
-                                 AltAz)
+                                 AltAz, get_sun)
 import astropy.units as u
 from astropy.units import Quantity
 
 import pytz
+import numpy as np
 
 ################################################################################
 # TODO: Temporary solution to IERS tables problems
@@ -29,12 +30,11 @@
 # and modified by Adrian Price-Whelan (email) and Erik Tollerud (email).
 
 __all__ = ["Observer", "Target", "FixedTarget", "NonFixedTarget",
-           "Constraint", "TimeWindow", "AltitudeRange",
-           "AboveAirmass", "Observation"]
+           "Constraint", "TimeRange", "AltitudeRange",
+           "AirmassRange", "Observation"]
 
 #__doctest_requires__ = {'*': ['scipy.integrate']}
 
-
 class Observer(object):
     """
     Some comments.
@@ -137,11 +137,16 @@ def altaz(self, target, time):
         time : `~astropy.time.Time`
             Object
         """
-        if not isinstance(target, FixedTarget):
+        if isinstance(target, FixedTarget):
+            coordinates = target.coord
+        elif isinstance(target, SkyCoord):
+            coordinates = target
+        else:
             raise TypeError('The target must be an instance of FixedTarget')
 
-        return target.coord.transform_to(AltAz(target.coord.ra, target.coord.dec,
-                                         location=self.location, obstime=time))
+        return coordinates.transform_to(AltAz(coordinates.ra, coordinates.dec,
+                                              location=self.location,
+                                              obstime=time))
 
     # Sun-related methods.
 
@@ -197,6 +202,15 @@ def sunrise(date_time, **kwargs):
         """
         raise NotImplementedError()
 
+    def _calc_rise_set_limits(self, time, dt, rise_set, N=150,
+                              return_bounds=True, return_a=False):
+        times = timelinspace(time, dt, N)
+        sun = get_sun(times)
+        altitudes = self.altaz(sun, times).alt
+        return self._horiz_cross(times, altitudes, rise_set,
+                                 return_bounds=True,
+                                 return_a=return_a)
+
     # Moon-related methods.
 
     def moonrise(date_time, **kwargs):
@@ -404,7 +418,7 @@ def apply_constraints(self, target, observer, constraint_list):
         raise NotImplementedError
 
 
-class TimeWindow(Constraint):
+class TimeRange(Constraint):
     """
     An object containing start and end times for an observation.
     """
@@ -440,12 +454,12 @@ def __init__(self, low, high):
         raise NotImplementedError
 
 
-class AboveAirmass(Constraint):
+class AirmassRange(Constraint):
     """
     An object containing an airmass lower limit.
     """
 
-    def __init__(self, low):
+    def __init__(self, low, upper=None):
         """
         Initializes an AboveAirmass object.