waveset class added, which combines chi2, chi2_2d