From b4490f27704c8f7a9e69d36a67865ad78e98616c Mon Sep 17 00:00:00 2001 From: Kelvin Date: Fri, 19 Apr 2019 15:10:50 -0700 Subject: [PATCH] changed name format again --- ale/drivers/base.py | 4 ++-- ale/drivers/{cassini_driver.py => cassini_drivers.py} | 5 ++--- ale/drivers/{dawn_driver.py => dawn_drivers.py} | 4 ++-- ale/drivers/{kaguya_driver.py => kaguya_drivers.py} | 2 +- ale/drivers/{lro_driver.py => lro_drivers.py} | 4 ++-- ale/drivers/{mdis_driver.py => messenger_drivers.py} | 8 ++++---- ale/drivers/{mro_driver.py => mro_drivers.py} | 10 +++++----- 7 files changed, 18 insertions(+), 19 deletions(-) rename ale/drivers/{cassini_driver.py => cassini_drivers.py} (93%) rename ale/drivers/{dawn_driver.py => dawn_drivers.py} (97%) rename ale/drivers/{kaguya_driver.py => kaguya_drivers.py} (99%) rename ale/drivers/{lro_driver.py => lro_drivers.py} (93%) rename ale/drivers/{mdis_driver.py => messenger_drivers.py} (94%) rename ale/drivers/{mro_driver.py => mro_drivers.py} (90%) diff --git a/ale/drivers/base.py b/ale/drivers/base.py index 2c6b4fe..790ad26 100644 --- a/ale/drivers/base.py +++ b/ale/drivers/base.py @@ -777,7 +777,7 @@ class NaifSpice(): return self.ikid - int(fn) -class Isis3Label(): +class IsisLabel(): @property def start_time(self): @@ -841,7 +841,7 @@ class Isis3Label(): return self.label['IsisCube']['Instrument']['ExposureDuration'].value * 0.001 -class IsisSpice(Isis3Label): +class IsisSpice(IsisLabel): """Mixin class for reading from an ISIS cube that has been spiceinit'd Attributes diff --git a/ale/drivers/cassini_driver.py b/ale/drivers/cassini_drivers.py similarity index 93% rename from ale/drivers/cassini_driver.py rename to ale/drivers/cassini_drivers.py index 408beeb..a424b07 100644 --- a/ale/drivers/cassini_driver.py +++ b/ale/drivers/cassini_drivers.py @@ -6,12 +6,11 @@ import spiceypy as spice import numpy as np from ale import config -from ale.drivers.base import Framer, RadialDistortion, Driver +from ale.drivers.base import Framer, RadialDistortion, Driver, Pds3, NaifSpice -class CassiniISS(Driver, Framer, RadialDistortion): +class CassiniIssPds3NaifSpiceDriver(Driver, Pds3, NaifSpice, Framer, RadialDistortion): """ - Cassini mixin class for defining snowflake Spice calls. """ id_lookup = { "ISSNA" : "CASSINI_ISS_NAC", diff --git a/ale/drivers/dawn_driver.py b/ale/drivers/dawn_drivers.py similarity index 97% rename from ale/drivers/dawn_driver.py rename to ale/drivers/dawn_drivers.py index 7f1916d..a872647 100644 --- a/ale/drivers/dawn_driver.py +++ b/ale/drivers/dawn_drivers.py @@ -4,7 +4,7 @@ from ale import config import pvl -class DawnSpice(Driver, Framer, NaifSpice): +class DawnFcNaifSpice(Driver, Framer, NaifSpice): """ Dawn specific spice mixin to handle dawn specific spice calls and property overrides. This class is not used as a driver. @@ -33,7 +33,7 @@ class DawnSpice(Driver, Framer, NaifSpice): pixel_size = spice.gdpool('INS{}_PIXEL_SIZE'.format(self.ikid), 0, 1)[0] * 0.001 return [0.0, 0.0, 1/pixel_size] -class DawnPDS3Driver(Pds3Label, DawnSpice, RadialDistortion): +class DawnFcPds3NaifSpiceDriver(Pds3Label, DawnFcNaifSpice, RadialDistortion): """ Dawn driver for generating an ISD from a Dawn PDS3 image. """ diff --git a/ale/drivers/kaguya_driver.py b/ale/drivers/kaguya_drivers.py similarity index 99% rename from ale/drivers/kaguya_driver.py rename to ale/drivers/kaguya_drivers.py index 396a7b8..c7a98eb 100644 --- a/ale/drivers/kaguya_driver.py +++ b/ale/drivers/kaguya_drivers.py @@ -10,7 +10,7 @@ from glob import glob from ale import config from ale.drivers.base import Driver, LineScanner, Pds3Label, NaifSpice, TransverseDistortion -class TcPds3Driver(Driver, LineScanner, Pds3Label, NaifSpice): +class KaguyaTcPds3NaifSpiceDriver(Driver, LineScanner, Pds3Label, NaifSpice): """ Driver for a PDS3 Kaguya Terrain Camera (TC) images. Specifically level2b0 mono and stereo images. diff --git a/ale/drivers/lro_driver.py b/ale/drivers/lro_drivers.py similarity index 93% rename from ale/drivers/lro_driver.py rename to ale/drivers/lro_drivers.py index 34c688d..22522e9 100644 --- a/ale/drivers/lro_driver.py +++ b/ale/drivers/lro_drivers.py @@ -9,7 +9,7 @@ from ale.util import get_metakernels from ale.drivers.base import LineScanner, NaifSpice, Pds3Label, Driver -class LrocSpice(Driver, NaifSpice, LineScanner): +class LroLrocNaifSpice(Driver, NaifSpice, LineScanner): """ Lroc mixin class for defining snowflake Spice calls. """ @@ -42,7 +42,7 @@ class LrocSpice(Driver, NaifSpice, LineScanner): return "LRO" -class LrocPds3Driver(Pds3Label, LrocSpice): +class LroLrocPds3NaifSpiceDriver(Pds3Label, LroLrocNaifSpice): """ Driver for reading Lroc labels. Requires a Spice mixin to acquire addtional ephemeris and instrument data located exclusively in spice kernels. diff --git a/ale/drivers/mdis_driver.py b/ale/drivers/messenger_drivers.py similarity index 94% rename from ale/drivers/mdis_driver.py rename to ale/drivers/messenger_drivers.py index 2aa2446..2bc9963 100644 --- a/ale/drivers/mdis_driver.py +++ b/ale/drivers/messenger_drivers.py @@ -6,10 +6,10 @@ import spiceypy as spice import numpy as np from ale import config -from ale.drivers.base import Framer, NaifSpice, Pds3Label, Isis3Label, Driver +from ale.drivers.base import Framer, NaifSpice, Pds3Label, IsisLabel, Driver -class MdisSpice(Driver, NaifSpice, Framer): +class MessengerMdisNaifSpice(Driver, NaifSpice, Framer): """ MDIS mixin class for defining snowflake Spice calls. Since MDIS has unique Spice keys, those are defined here as an intermediate mixin for MDIS drivers @@ -98,7 +98,7 @@ class MdisSpice(Driver, NaifSpice, Framer): def _detector_center_line(self): return float(spice.gdpool('INS{}_BORESIGHT'.format(self.ikid), 0, 3)[1]) -class MdisPDS3Driver(Pds3Label, MdisSpice): +class MessengerMdisPds3NaifSpiceDriver(Pds3Label, MessengerMdisNaifSpice): """ Driver for reading MDIS PDS3 labels. Requires a Spice mixin to acquire addtional ephemeris and instrument data located exclusively in spice kernels. @@ -118,7 +118,7 @@ class MdisPDS3Driver(Pds3Label, MdisSpice): return self.id_lookup[self.label['INSTRUMENT_ID']] -class MdisIsis3Driver(Isis3Label, MdisSpice): +class MessengerMdisIsisLabelNaifSpiceDriver(IsisLabel, MessengerMdisNaifSpice): """ Driver for reading MDIS ISIS3 Labels. These are Labels that have been ingested into ISIS from PDS EDR images but have not been spiceinit'd yet. diff --git a/ale/drivers/mro_driver.py b/ale/drivers/mro_drivers.py similarity index 90% rename from ale/drivers/mro_driver.py rename to ale/drivers/mro_drivers.py index 7c04e34..b5f4254 100644 --- a/ale/drivers/mro_driver.py +++ b/ale/drivers/mro_drivers.py @@ -6,9 +6,9 @@ import pvl import spiceypy as spice from ale import config -from ale.drivers.base import LineScanner, NaifSpice, Pds3Label, Isis3Label, IsisSpice, Driver, RadialDistortion +from ale.drivers.base import LineScanner, NaifSpice, Pds3Label, IsisLabel, IsisSpice, Driver, RadialDistortion -class CtxNaifSpiceIsisLabelDriver(Driver, IsisSpice, LineScanner, RadialDistortion): +class MroCtxIsisLabelIsisSpiceDriver(Driver, IsisSpice, LineScanner, RadialDistortion): @property def instrument_id(self): @@ -36,7 +36,7 @@ class CtxNaifSpiceIsisLabelDriver(Driver, IsisSpice, LineScanner, RadialDistorti def line_exposure_duration(self): return self.label["IsisCube"]["Instrument"]["LineExposureDuration"].value * 0.001 # Scale to seconds -class CtxSpice(Driver, NaifSpice, LineScanner, RadialDistortion): +class MroCtxNaifSpice(Driver, NaifSpice, LineScanner, RadialDistortion): """ Spice mixins that defines MRO CTX specific snowflake Spice calls. """ @@ -63,7 +63,7 @@ class CtxSpice(Driver, NaifSpice, LineScanner, RadialDistortion): self._metakernel = mk return self._metakernel -class CtxSpiceInitedIsisCubeDriver(Isis3Label, CtxSpice): +class MroCtxIsisLabelNaifSpiceDriver(IsisLabel, MroCtxNaifSpice): @property def instrument_id(self): return "MRO_CTX" @@ -85,7 +85,7 @@ class CtxSpiceInitedIsisCubeDriver(Isis3Label, CtxSpice): def spacecraft_name(self): return "MRO" -class CtxPds3Driver(Pds3Label, CtxSpice): +class MroCtxPds3LabelNaifSpiceDriver(Pds3Label, MroCtxNaifSpice): """ Driver for reading CTX PDS3 labels. Requires a Spice mixin to acquire addtional ephemeris and instrument data located exclusively in spice kernels. -- GitLab