From a3b98166d8ec954329e720da1ef70db7c8dfdbed Mon Sep 17 00:00:00 2001
From: acpaquette <acp263@nau.edu>
Date: Wed, 8 Mar 2023 19:05:35 -0700
Subject: [PATCH] General drive import and spacing cleanup
---
ale/base/base.py | 1 -
ale/drivers/lro_drivers.py | 9 +--------
ale/drivers/mess_drivers.py | 7 -------
ale/drivers/mro_drivers.py | 2 ++
ale/drivers/msi_drivers.py | 11 ++---------
ale/drivers/selene_drivers.py | 1 +
ale/drivers/tgo_drivers.py | 10 ++--------
7 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/ale/base/base.py b/ale/base/base.py
index bf6ad36..28eb35f 100644
--- a/ale/base/base.py
+++ b/ale/base/base.py
@@ -1,4 +1,3 @@
-import pvl
import json
class Driver():
diff --git a/ale/drivers/lro_drivers.py b/ale/drivers/lro_drivers.py
index bd68da5..8e290b2 100644
--- a/ale/drivers/lro_drivers.py
+++ b/ale/drivers/lro_drivers.py
@@ -1,12 +1,8 @@
-import os
-import re
import numpy as np
-import pvl
import spiceypy as spice
-from glob import glob
from pyspiceql import pyspiceql
-from ale.util import get_metakernels, query_kernel_pool
+from ale.util import query_kernel_pool
from ale.base import Driver
from ale.base.data_naif import NaifSpice
from ale.base.data_isis import IsisSpice
@@ -278,8 +274,6 @@ class LroLrocNacPds3LabelNaifSpiceDriver(LineScanner, NaifSpice, Pds3Label, Driv
rotated_velocity = spice.mxv(rotation._rots.as_matrix()[0], velocity)
return rotated_velocity[0]
-
-
class LroLrocNacIsisLabelNaifSpiceDriver(LineScanner, NaifSpice, IsisLabel, Driver):
@property
def instrument_id(self):
@@ -859,7 +853,6 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
return self.target_frame_id
-
class LroLrocWacIsisLabelIsisSpiceDriver(PushFrame, IsisLabel, IsisSpice, RadialDistortion, Driver):
@property
def instrument_id(self):
diff --git a/ale/drivers/mess_drivers.py b/ale/drivers/mess_drivers.py
index 31df9fe..e56e9bf 100644
--- a/ale/drivers/mess_drivers.py
+++ b/ale/drivers/mess_drivers.py
@@ -1,8 +1,3 @@
-from glob import glob
-import os
-
-import pvl
-import spiceypy as spice
import numpy as np
from pyspiceql import pyspiceql
@@ -73,7 +68,6 @@ class MessengerMdisIsisLabelIsisSpiceDriver(Framer, IsisLabel, IsisSpice, NoDist
"""
return ID_LOOKUP[super().instrument_id]
-
class MessengerMdisPds3NaifSpiceDriver(Framer, Pds3Label, NaifSpice, NoDistortion, Driver):
"""
Driver for reading MDIS PDS3 labels. Requires a Spice mixin to acquire additional
@@ -249,7 +243,6 @@ class MessengerMdisPds3NaifSpiceDriver(Framer, Pds3Label, NaifSpice, NoDistortio
"""
return pyspiceql.getKernelStringValue('INS{}_PIXEL_PITCH'.format(self.ikid))
-
class MessengerMdisIsisLabelNaifSpiceDriver(IsisLabel, NaifSpice, Framer, NoDistortion, Driver):
"""
Driver for reading MDIS ISIS3 Labels. These are Labels that have been ingested
diff --git a/ale/drivers/mro_drivers.py b/ale/drivers/mro_drivers.py
index 11b20ce..708eb08 100644
--- a/ale/drivers/mro_drivers.py
+++ b/ale/drivers/mro_drivers.py
@@ -513,6 +513,7 @@ class MroCtxPds3LabelNaifSpiceDriver(LineScanner, Pds3Label, NaifSpice, RadialDi
"""
return self.label['SPACECRAFT_NAME']
+
hirise_ccd_lookup = {
0: 0,
1: 1,
@@ -702,6 +703,7 @@ class MroHiRiseIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Radia
return 1
+
class MroCrismIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, NoDistortion, Driver):
"""
Driver for reading Crism ISIS labels.
diff --git a/ale/drivers/msi_drivers.py b/ale/drivers/msi_drivers.py
index c06476f..c213c56 100644
--- a/ale/drivers/msi_drivers.py
+++ b/ale/drivers/msi_drivers.py
@@ -1,16 +1,9 @@
-import os
-import spiceypy as spice
-import json
-import numpy as np
-import pvl
-import ale
from ale.base import Driver
from ale.base.label_isis import IsisLabel
from ale.base.data_naif import NaifSpice
-from ale.base.type_distortion import RadialDistortion, NoDistortion
-from ale.base.type_sensor import Framer, LineScanner
-from ale.util import generate_kernels_from_cube
+from ale.base.type_distortion import NoDistortion
+from ale.base.type_sensor import Framer
from ale.base.type_sensor import Framer
from ale.base.type_distortion import NoDistortion
diff --git a/ale/drivers/selene_drivers.py b/ale/drivers/selene_drivers.py
index 0892c2d..c3320e4 100644
--- a/ale/drivers/selene_drivers.py
+++ b/ale/drivers/selene_drivers.py
@@ -829,6 +829,7 @@ class KaguyaTcIsisLabelNaifSpiceDriver(LineScanner, IsisLabel, NaifSpice, Driver
def sensor_model_version(self):
return 2
+
class KaguyaMiPds3NaifSpiceDriver(LineScanner, Pds3Label, NaifSpice, KaguyaSeleneDistortion, Driver):
"""
Driver for a PDS3 Kaguya Multiband Imager (Mi) images. Specifically level2b2 Vis and Nir images.
diff --git a/ale/drivers/tgo_drivers.py b/ale/drivers/tgo_drivers.py
index 574d9e5..5e65546 100644
--- a/ale/drivers/tgo_drivers.py
+++ b/ale/drivers/tgo_drivers.py
@@ -1,11 +1,5 @@
-from glob import glob
-import os
-
-import struct
-import pvl
-import numpy as np
-
from pyspiceql import pyspiceql
+
from ale.base import Driver
from ale.base.data_naif import NaifSpice
from ale.base.label_isis import IsisLabel
@@ -50,7 +44,7 @@ class TGOCassisIsisLabelNaifSpiceDriver(Framer, IsisLabel, NaifSpice, NoDistorti
: float
ephemeris start time of the image.
"""
- return pyspiceql.utc2et(self.utc_start_time.strftime("%Y-%m-%d %H:%M:%S.%f")))
+ return pyspiceql.utc2et(self.utc_start_time.strftime("%Y-%m-%d %H:%M:%S.%f"))
@property
def sensor_frame_id(self):
--
GitLab