Some more fixes for the cdp.exp_type now being dependent on the spectrum ID.

This follows from http://thread.gmane.org/gmane.science.nmr.relax.devel/4530, the thread about
supporting multiple data types such as SQ+MQ data simultaneously.