Skip to content
Snippets Groups Projects
Commit 699582f0 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Fixed pre-parse try except (#414)

* Fixed pre-parse try except

* Fixed comparison warnings
parent fb162335
No related branches found
No related tags found
No related merge requests found
......@@ -98,13 +98,16 @@ def load(label, props={}, formatter='ale', verbose=False):
try:
# Try default grammar for pds3 label
parsed_label = parse_label(label)
except ValueError as e:
except Exception as e:
if verbose:
print("First parse attempt failed with")
print(e)
# If pds3 label fails, try isis grammar
try:
parsed_label = parse_label(label, pvl.grammar.ISISGrammar())
except Exception as e:
if verbose:
print("Second parse attempt failed with")
print(e)
# If both fail, then don't parse the label, and just pass the driver a file.
parsed_label = None
......
......@@ -154,23 +154,23 @@ class FrameChain(nx.DiGraph):
print(e)
break
if frame_type is 1 or frame_type is 2:
if frame_type == 1 or frame_type == 2:
frame_code = 1
elif frame_type is 3:
elif frame_type == 3:
try:
matrix, frame_code = spice.ckfrot(frame_type_id, ephemeris_time)
except:
raise Exception(f"The ck rotation from frame {frame_codes[-1]} can not \
be found due to no pointing available at requested time \
or a problem with the frame")
elif frame_type is 4:
elif frame_type == 4:
try:
matrix, frame_code = spice.tkfram(frame_type_id)
except:
raise Exception(f"The tk rotation from frame {frame_codes[-1]} can not \
be found")
elif frame_type is 5:
elif frame_type == 5:
matrix, frame_code = spice.zzdynrot(frame_type_id, center, ephemeris_time)
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment