Commit 1bc84648 authored by Kristin's avatar Kristin Committed by Jesse Mapel
Browse files

Cassini ISS - rotation fix? (#201)

* Updated history

* Small fixes based on feedback

* Small fixes based on feedback
parent d5943ec3
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ class TimeDependentRotation:
        if isinstance(other, ConstantRotation):
            return TimeDependentRotation((self._rots * other._rot).as_quat(), self.times, other.source, self.dest)
        elif isinstance(other, TimeDependentRotation):
            # if self and other each have the same time and one rotation, don't interpolate.
            if (self.times.size == 1) and (other.times.size == 1) and (self.times == other.times):
                return TimeDependentRotation((self._rots * other._rots).as_quat(), self.times, other.source, self.dest)
            merged_times = np.union1d(np.asarray(self.times), np.asarray(other.times))
            # we cannot extrapolate so clip to the time range both cover
            first_time = max(min(self.times), min(other.times))