Rewriting correlation processing to handle diagonal and multi-baseline