Merge remote-tracking branch 'origin/rel-5.2.107'

Crunch-io · Jun 26, 2018 · 74f7f51 · 74f7f51
2 parents ba5273f + ab4c687
commit 74f7f51
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/cr/cube/crunch_cube.py b/src/cr/cube/crunch_cube.py
@@ -1159,7 +1159,14 @@ def pvals(self, weighted=True, prune=False, hs_dims=None):
                        crunch cube.
         '''
         stats = self.zscore(weighted=weighted, prune=prune, hs_dims=hs_dims)
-        return 2 * (1 - norm.cdf(np.abs(stats)))
+        res = 2 * (1 - norm.cdf(np.abs(stats)))
+
+        if isinstance(stats, np.ma.core.MaskedArray):
+            # Explicit setting of the mask is necessary, because the norm.cdf
+            # creates a non-masked version
+            res = np.ma.masked_array(res, stats.mask)
+
+        return res
 
     def scale_means(self):
         '''Get cube means.'''