Commit 8ed3bda2 authored by Jesse Mapel's avatar Jesse Mapel Committed by Kristin
Browse files

Updated mix-in order so that line scanner is last (#235)

parent dedfd07a

ale/drivers/cassini_drivers.py

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ from ale.transformation import FrameChain 
from scipy.spatial.transform import Rotation

from scipy.spatial.transform import Rotation









class CassiniIssPds3LabelNaifSpiceDriver(Pds3Label, NaifSpice, Framer, RadialDistortion, Driver):

class CassiniIssPds3LabelNaifSpiceDriver(Framer, Pds3Label, NaifSpice, RadialDistortion, Driver):

    """

    """

    Cassini mixin class for defining Spice calls.

    Cassini mixin class for defining Spice calls.

    """

    """
@@ -296,4 +296,3 @@ class CassiniIssPds3LabelNaifSpiceDriver(Pds3Label, NaifSpice, Framer, RadialDis 
          return 14082360

          return 14082360

        elif self.instrument_id == "CASSINI_ISS_WAC":

        elif self.instrument_id == "CASSINI_ISS_WAC":

          return self._original_naif_sensor_frame_id
 
          return self._original_naif_sensor_frame_id

ale/drivers/dawn_drivers.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ from ale.base.data_naif import NaifSpice 
from ale.base.label_pds3 import Pds3Label

from ale.base.label_pds3 import Pds3Label

from ale.base.type_sensor import Framer

from ale.base.type_sensor import Framer





class DawnFcPds3NaifSpiceDriver(Pds3Label, NaifSpice, Framer, Driver):

class DawnFcPds3NaifSpiceDriver(Framer, Pds3Label, NaifSpice, Driver):

    """

    """

    Dawn driver for generating an ISD from a Dawn PDS3 image.

    Dawn driver for generating an ISD from a Dawn PDS3 image.

    """

    """

ale/drivers/isis_ideal_drivers.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ from ale.base.type_sensor import LineScanner 
from ale.base.type_distortion import NoDistortion

from ale.base.type_distortion import NoDistortion









class IdealLsIsisLabelIsisSpiceDriver(IsisSpice, LineScanner, IsisLabel, NoDistortion, Driver):

class IdealLsIsisLabelIsisSpiceDriver(LineScanner, IsisSpice, IsisLabel, NoDistortion, Driver):

    @property

    @property

    def sensor_name(self):

    def sensor_name(self):

        """

        """

ale/drivers/kaguya_drivers.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ from ale.base.label_pds3 import Pds3Label 
from ale.base.type_sensor import LineScanner

from ale.base.type_sensor import LineScanner









class KaguyaTcPds3NaifSpiceDriver(Pds3Label,NaifSpice, LineScanner, Driver):

class KaguyaTcPds3NaifSpiceDriver(LineScanner, Pds3Label, NaifSpice, Driver):

    """

    """

    Driver for a PDS3 Kaguya Terrain Camera (TC) images. Specifically level2b0 mono and stereo images.

    Driver for a PDS3 Kaguya Terrain Camera (TC) images. Specifically level2b0 mono and stereo images.

ale/drivers/lro_drivers.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ from ale.base.label_pds3 import Pds3Label 
from ale.base.type_sensor import LineScanner

from ale.base.type_sensor import LineScanner









class LroLrocPds3LabelNaifSpiceDriver(NaifSpice, Pds3Label, LineScanner, Driver):

class LroLrocPds3LabelNaifSpiceDriver(LineScanner, NaifSpice, Pds3Label, Driver):

    """

    """

    Driver for reading LROC NACL, NACR (not WAC, it is a push frame) labels. Requires a Spice mixin to

    Driver for reading LROC NACL, NACR (not WAC, it is a push frame) labels. Requires a Spice mixin to

    acquire addtional ephemeris and instrument data located exclusively in SPICE kernels, A PDS3 label,

    acquire addtional ephemeris and instrument data located exclusively in SPICE kernels, A PDS3 label,