Skip to content

Commit 23eb341

Browse files
authored
Merge pull request #283 from wtgee/issue-282-fixes
Small fixes for astropy 1.3 as discussed in #282
2 parents fbfe42d + 9d4d107 commit 23eb341

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

‎astroplan/observer.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,8 @@ def _horiz_cross(self, t, alt, rise_set, horizon=0*u.degree):
587587
target_inds = np.array(target_inds)
588588
time_inds = np.array(time_inds)
589589

590-
times = [t[i:i+2] if not np.isnan(i) else np.nan for i in time_inds]
591-
altitudes = [alt[i, j:j+2] if not np.isnan(j) else np.nan
590+
times = [t[int(i):int(i+2)] if not np.isnan(i) else np.nan for i in time_inds]
591+
altitudes = [alt[int(i), int(j):int(j+2)] if not np.isnan(j) else np.nan
592592
for i, j in zip(target_inds, time_inds)]
593593

594594
return times, altitudes
@@ -700,10 +700,7 @@ def _calc_riseset(self, time, target, prev_next, rise_set, horizon, N=150):
700700
times = _generate_24hr_grid(time, -1, 0, N)
701701

702702
altaz = self.altaz(times, target)
703-
if target_is_vector:
704-
altitudes = [aa.alt for aa in altaz]
705-
else:
706-
altitudes = altaz.alt
703+
altitudes = altaz.alt
707704

708705
time_limits, altitude_limits = self._horiz_cross(times, altitudes, rise_set,
709706
horizon)

0 commit comments

Comments
 (0)