Refactor traster: separate calc and plot, return psths