Restructured spectrum data for XPS parser
Supplemental channel data (those other than energy and count) are put together in a 2D array. Also fixed some test stuff.
Supplemental channel data (those other than energy and count) are put together in a 2D array. Also fixed some test stuff.