Bugfix in correlation_mc_analysis

Closes #290 and makes #314 obsolete as we store both auto- and
cross-correlations
(manually cherry picked from commit f995f3da90c94d2f2179c3e075a89116b27720cc)