rename "y" component to "trace"

glue_astronomy/translators/tests/test_trace.py

@@ -17,14 +17,14 @@ def test_trace():
     data_collection['trace'] = trace
     data = data_collection['trace']
     assert isinstance(data, Data)
-    assert np.all(data['y'] == trace.trace)
+    assert np.all(data['trace'] == trace.trace)
 
     trace_from_data = data.get_object()
     assert isinstance(trace_from_data, tracing.FlatTrace)
 
     # now edit the glue data object, this should now map to an ArrayTrace (instead of a FlatTrace)
     new_trace = np.ones_like(trace.trace)
-    data.update_components({data.get_component('y'): new_trace})
+    data.update_components({data.get_component('trace'): new_trace})
     trace_from_data = data.get_object()
     assert isinstance(trace_from_data, tracing.ArrayTrace)
     assert np.all(trace_from_data.trace == new_trace)

glue_astronomy/translators/trace.py

@@ -18,7 +18,7 @@ def to_data(self, obj):
         obj : `specreduce.tracing.Trace`
             The Trace object to convert
         """
-        data = Data(x=obj.image[0], y=obj.trace)
+        data = Data(x=obj.image[0], trace=obj.trace)
         if hasattr(obj, 'meta'):
             data.meta.update(obj.meta)
         data.meta['Trace'] = obj
@@ -47,7 +47,7 @@ def to_object(self, data, attribute=None):
         # these arrays are still the appropriate length
         if not np.all(trace_x == data['x']):
             raise ValueError("x-values have changed")
-        if not np.all(trace.trace[1] == data['y']):
-            trace = ArrayTrace(trace.image, data['y'])
+        if not np.all(trace.trace[1] == data['trace']):
+            trace = ArrayTrace(trace.image, data['trace'])
 
         return trace