Skip to content
Snippets Groups Projects
Commit 1e74facd authored by Austin Sanders's avatar Austin Sanders
Browse files

Updated for PVL 1.0

parent e3b3b557
No related branches found
No related tags found
No related merge requests found
...@@ -148,7 +148,7 @@ def to_isis(obj, path, mode='wb', version=2, ...@@ -148,7 +148,7 @@ def to_isis(obj, path, mode='wb', version=2,
buffer_header_size, points_bytes, buffer_header_size, points_bytes,
creation_date, modified_date) creation_date, modified_date)
store.write(header) store.write(header.encode('utf-8'))
class IsisStore(object): class IsisStore(object):
""" """
...@@ -292,8 +292,8 @@ class IsisStore(object): ...@@ -292,8 +292,8 @@ class IsisStore(object):
""" """
Parameters Parameters
---------- ----------
data : str data : bytes
to be written to the file Encoded header to be written to the file
offset : int offset : int
The byte offset into the output binary The byte offset into the output binary
""" """
...@@ -461,7 +461,7 @@ class IsisStore(object): ...@@ -461,7 +461,7 @@ class IsisStore(object):
An ISIS compliant PVL header object An ISIS compliant PVL header object
""" """
encoder = pvl.encoder.IsisCubeLabelEncoder encoder = pvl.encoder.ISISEncoder(end_delimiter=False)
header_bytes = buffer_header_size header_bytes = buffer_header_size
points_start_byte = HEADERSTARTBYTE + buffer_header_size points_start_byte = HEADERSTARTBYTE + buffer_header_size
...@@ -489,4 +489,4 @@ class IsisStore(object): ...@@ -489,4 +489,4 @@ class IsisStore(object):
) )
]) ])
return pvl.dumps(header, cls=encoder) return pvl.dumps(header, encoder=encoder)
...@@ -100,7 +100,7 @@ class Spectral_Profiler(object): ...@@ -100,7 +100,7 @@ class Spectral_Profiler(object):
"^SP_SPECTRUM_REF1", "^SP_SPECTRUM_QA", "^L2D_RESULT_ARRAY", "^SP_SPECTRUM_REF1", "^SP_SPECTRUM_QA", "^L2D_RESULT_ARRAY",
"^SP_SPECTRUM_RAD"]: "^SP_SPECTRUM_RAD"]:
continue continue
if isinstance(v, pvl._collections.Units): if isinstance(v, pvl.collections.Quantity):
k = "{}_{}".format(k, v.units) k = "{}_{}".format(k, v.units)
v = v.value v = v.value
keys.append(k) keys.append(k)
......
...@@ -239,7 +239,7 @@ class Tes(object): ...@@ -239,7 +239,7 @@ class Tes(object):
with open(var_file, "rb") as var: with open(var_file, "rb") as var:
buffer = var.read() buffer = var.read()
def process_rad(index): def process_rad(index):
if index is -1: if index == -1:
return None return None
length = np.frombuffer(buffer[index:index+2], dtype='>u2')[0] length = np.frombuffer(buffer[index:index+2], dtype='>u2')[0]
......
...@@ -7,6 +7,7 @@ import plio ...@@ -7,6 +7,7 @@ import plio
from plio.data import get_data from plio.data import get_data
from plio.io.io_db import Translations, StringToMission, setup_db_session from plio.io.io_db import Translations, StringToMission, setup_db_session
from plio.utils.utils import find_in_dict, find_nested_in_dict from plio.utils.utils import find_in_dict, find_nested_in_dict
from datetime import datetime
def get_isis_translation(label): def get_isis_translation(label):
...@@ -70,7 +71,7 @@ def generate_serial_number(label): ...@@ -70,7 +71,7 @@ def generate_serial_number(label):
The ISIS compatible serial number The ISIS compatible serial number
""" """
if not isinstance(label, PVLModule): if not isinstance(label, PVLModule):
label = pvl.load(label, cls=SerialNumberDecoder) label = pvl.load(label, decoder=SerialNumberDecoder())
# Get the translation information # Get the translation information
translation = get_isis_translation(label) translation = get_isis_translation(label)
...@@ -96,9 +97,16 @@ def generate_serial_number(label): ...@@ -96,9 +97,16 @@ def generate_serial_number(label):
serial_entry = search_translation[serial_entry] serial_entry = search_translation[serial_entry]
elif '*' in search_translation.keys() and search_translation['*'] != '*': elif '*' in search_translation.keys() and search_translation['*'] != '*':
serial_entry = search_translation['*'] serial_entry = search_translation['*']
try:
serial_entry = serial_entry.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3]
except:
pass
serial_number.append(serial_entry) serial_number.append(serial_entry)
except: except:
pass pass
print(serial_number)
return '/'.join(serial_number) return '/'.join(serial_number)
...@@ -108,7 +116,7 @@ class SerialNumberDecoder(pvl.decoder.PVLDecoder): ...@@ -108,7 +116,7 @@ class SerialNumberDecoder(pvl.decoder.PVLDecoder):
serial number. Inherits from the PVLDecoder in planetarypy's pvl module. serial number. Inherits from the PVLDecoder in planetarypy's pvl module.
""" """
def cast_unquoated_string(self, value): def cast_unquoted_string(self, value):
""" """
Overrides the parent class's method so that any un-quoted string type value found in the Overrides the parent class's method so that any un-quoted string type value found in the
parsed pvl will just return the original value. This is needed so that keyword values parsed pvl will just return the original value. This is needed so that keyword values
......
...@@ -240,7 +240,7 @@ def split_all_ext(path): ...@@ -240,7 +240,7 @@ def split_all_ext(path):
""" """
base, ext = os.path.splitext(path) base, ext = os.path.splitext(path)
while len(ext) is not 0: while len(ext) != 0:
base, ext = os.path.splitext(base) base, ext = os.path.splitext(base)
return base return base
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment