Merge pull request #144 from e-koch/mvc_avg_lwidth

MVC Average Linewidth Correction
Astroua · Mar 2, 2017 · 07fb623 · 07fb623
2 parents 5a7932e + b253784
commit 07fb623
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/CHANGE.rst b/CHANGE.rst
@@ -1,6 +1,7 @@
 
 Version 1.0 (unreleased)
 ------------------------
+* #144 - Fix the MVC: subtract mean velocity dispersion, not the array of dispersions.
 * #143 - Set periodic boundaries for dendrograms.
 * #141 - Added fitting for delta-variance. Added setting of fit limits for delta-variance, wavelets, power spectrum, MVC, and VCA.
 * #138 - Add fitting routines and more normalization options for PDFs. Added testing for numpy 1.12 and astropy 1.3.

diff --git a/turbustat/statistics/mvc/mvc.py b/turbustat/statistics/mvc/mvc.py
@@ -70,7 +70,7 @@ def compute_pspec(self):
 
         term1 = fft2(self.centroid * self.moment0)
 
-        term2 = np.power(self.linewidth, 2) + np.power(self.centroid, 2)
+        term2 = np.nanmean(self.linewidth**2 + self.centroid**2)
 
         mvc_fft = term1 - term2 * fft2(self.moment0)
 

diff --git a/turbustat/tests/data/checkVals.npz b/turbustat/tests/data/checkVals.npz
diff --git a/turbustat/tests/data/computed_distances.npz b/turbustat/tests/data/computed_distances.npz