Fix trace coordinate metadata for 2D
Use correct trace header fields for X/Y coordinates for 2D trace positions; for some types of 2D we were using the wrong trace header field.
Create 2D trace coordinate metadata for unbinned data; we were not creating this metadata.
(cherry picked from commit a258141d)