Skip to content

Commit

Permalink
cherry-pick results fix
Browse files Browse the repository at this point in the history
  • Loading branch information
havok2063 committed Aug 14, 2018
1 parent 87f7f8c commit cf843d1
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions python/marvin/tools/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,8 @@ def convertToTool(self, tooltype, **kwargs):

self.objects.append(self._get_object(ModelCube, **mapkwargs))

def _get_object(self, obj, **kwargs):
@staticmethod
def _get_object(obj, **kwargs):
''' Return a Marvin object or an error message
To preserve the lengths of self.results and self.objects, it will
Expand All @@ -1508,8 +1509,8 @@ def _get_object(self, obj, **kwargs):
except MarvinError as e:
plateifu = kwargs.get('plateifu', '')
inst = 'Error creating {0} for {1}: {2}'.format(obj.__name__, plateifu, e)
else:
return inst

return inst

def plot(self, x_name, y_name, **kwargs):
''' Make a scatter plot from two columns of results
Expand Down

0 comments on commit cf843d1

Please sign in to comment.