Merge pull request #1837 from pypeit/hotfix_align

Hotfix display

doc/releases/1.16.1dev.rst

@@ -52,3 +52,4 @@ Bug Fixes
 - Fixed a fault caused when all frames in a pypeit file are identified as being
   part of ``all`` calibration groups.
 - Allow for empty 2D wavecal solution in HDU extension of WaveCalib file
+- Fixed a bug in the ginga display function, when the user doesn't provide the `trc_name` argument.

pypeit/alignframe.py

@@ -316,8 +316,7 @@ def show_alignment(alignframe, align_traces=None, slits=None, clear=False):
                 if slt%2 == 0:
                     color = 'magenta'
                 # Display the trace
-                display.show_trace(viewer, channel, align_traces[:, bar, slt], trc_name="",
-                                   color=color)
+                display.show_trace(viewer, channel, align_traces[:, bar, slt], color=color)
 
 
 class AlignmentSplines:

pypeit/display/display.py

@@ -485,6 +485,7 @@ def show_trace(viewer, ch, trace, trc_name=None, maskdef_extr=None, manual_extr=
     ntrace = trace.shape[1]
     _maskdef_extr = ntrace*[False] if maskdef_extr is None else maskdef_extr
     _manual_extr = ntrace*[False] if manual_extr is None else manual_extr
+    _trc_name = ntrace*[''] if trc_name is None else trc_name
 
     # Show
     if yval is None:
@@ -507,8 +508,8 @@ def show_trace(viewer, ch, trace, trc_name=None, maskdef_extr=None, manual_extr=
         # Text
         ohf = len(trace[:,i])//2
         # Do it
-        canvas_list += [dict(type='text',args=(float(y[ohf,i]), float(trace[ohf,i]), str(trc_name[i])) if rotate
-                             else (float(trace[ohf,i]), float(y[ohf,i]), str(trc_name[i])),
+        canvas_list += [dict(type='text',args=(float(y[ohf,i]), float(trace[ohf,i]), str(_trc_name[i])) if rotate
+                             else (float(trace[ohf,i]), float(y[ohf,i]), str(_trc_name[i])),
                              kwargs=dict(color=_color, fontsize=17., rot_deg=90.))]
 
     canvas.add('constructedcanvas', canvas_list)