implemented structure factor in correlator again