most of the way to combined primary/secondary p and He spectra

With tests. Tests for total spectra will fail until we finish
the f functions.