Revert "additional throwaway runs for generating peak picked data"

This reverts commit a7aca4a16e36b8a87690d0cc2801e3c4bf929193.
extend patcher data model to deal with spin systems, assignments, and residues