Commit 6c2da895 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Driver Update and Re-enable (#381) 

* Removed generic divide by 64 on image lines

* Update a chunk of drivers to test with the ale formatter instead of the ISIS formatter

* Updated formatter test names to start with something other than test

* Moved some isds out of the test file and into the isd directory

* Readded cassis driver import

* Made variable names consistent throughout tests and removed commented out xfail decorators

* Added themis vis and ir isds

* Disabled drivers again

* Added xfails back to disabled drivers
parent bc3f2368

ale/drivers/hayabusa2_drivers.py

+2 −1
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ import ale 
from ale.base.data_naif import NaifSpice

from ale.base.label_isis import IsisLabel

from ale.base.type_sensor import Framer

from ale.base.type_distortion import NoDistortion

from ale.base.base import Driver



class Hayabusa2ONCIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Driver):

class Hayabusa2ONCIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, NoDistortion, Driver):



    @property

    def instrument_id(self):

ale/drivers/juno_drivers.py

+2 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ from ale import util 
from ale.base.data_naif import NaifSpice

from ale.base.label_isis import IsisLabel

from ale.base.type_sensor import Framer

from ale.base.type_distortion import NoDistortion

from ale.base.base import Driver



class JunoJunoCamIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Driver):

class JunoJunoCamIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, NoDistortion, Driver):

    """

    Driver for reading Juno ISIS labels.

    """

ale/drivers/nh_drivers.py

+15 −2
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ import spiceypy as spice 
import numpy as np



from ale.base import Driver

from ale.base.type_distortion import NoDistortion

from ale.base.data_naif import NaifSpice

from ale.base.label_isis import IsisLabel

from ale.base.type_sensor import Framer



class NewHorizonsLorriIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Driver):

class NewHorizonsLorriIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, NoDistortion, Driver):

    """

    Driver for reading New Horizons LORRI ISIS3 Labels. These are Labels that have been

    ingested into ISIS from PDS EDR images but have not been spiceinit'd yet.
@@ -52,3 +53,15 @@ class NewHorizonsLorriIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Dri 
          Naif Integer ID code for the instrument

        """

        return self.label['IsisCube']['Kernels']['NaifFrameCode']



    @property

    def detector_center_line(self):

        return float(spice.gdpool('INS{}_BORESIGHT'.format(self.ikid), 0, 3)[0])



    @property

    def detector_center_sample(self):

        return float(spice.gdpool('INS{}_BORESIGHT'.format(self.ikid), 0, 3)[1])



    @property

    def sensor_name(self):

        return self.label['IsisCube']['Instrument']['SpacecraftName']

ale/drivers/ody_drivers.py

+36 −3
Original line number Diff line number Diff line 
import spiceypy as spice



import ale

from ale.base.base import Driver

from ale.base.type_distortion import NoDistortion

from ale.base.data_naif import NaifSpice

from ale.base.label_isis import IsisLabel

from ale.base.type_sensor import LineScanner

from ale.base.base import Driver



import pvl



class OdyThemisIrIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Driver):

class OdyThemisIrIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, NoDistortion, Driver):

    """

    Driver for Themis IR ISIS cube

    """
@@ -59,8 +60,24 @@ class OdyThemisIrIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Dri 


        return og_start_time + offset



    @property

    def focal_length(self):

        return 202.059



    @property

    def detector_center_line(self):

        return 0



    @property

    def detector_center_sample(self):

        return 0

    

    @property

    def sensor_name(self):

        return self.label['IsisCube']['Instrument']['SpacecraftName']





class OdyThemisVisIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Driver):

class OdyThemisVisIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, NoDistortion, Driver):

    """"

    Driver for Themis VIS ISIS cube

    """
@@ -136,3 +153,19 @@ class OdyThemisVisIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Dr 
            # if no units are available, assume the exposure duration is given in milliseconds

            line_exposure_duration = line_exposure_duration * 0.001

        return line_exposure_duration



    @property

    def focal_length(self):

        return 202.059



    @property

    def detector_center_line(self):

        return 0



    @property

    def detector_center_sample(self):

        return 0



    @property

    def sensor_name(self):

        return self.label['IsisCube']['Instrument']['SpacecraftName']

ale/drivers/tgo_drivers.py

+6 −1
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ from ale.base import Driver 
from ale.base.data_naif import NaifSpice

from ale.base.label_isis import IsisLabel

from ale.base.type_sensor import Framer

from ale.base.type_distortion import NoDistortion



class TGOCassisIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Driver):

class TGOCassisIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, NoDistortion, Driver):

    """

    Driver for reading TGO Cassis ISIS3 Labels. These are Labels that have been ingested

    into ISIS from PDS EDR images but have not been spiceinit'd yet.
@@ -64,3 +65,7 @@ class TGOCassisIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, Driver): 
          ISIS sensor model version

        """

        return 1



    @property

    def sensor_name(self):

        return self.label['IsisCube']['Instrument']['SpacecraftName']