Merge a8f733e into 85398cf

radio-astro-tools · May 16, 2014 · cb9214d · cb9214d
2 parents 85398cf + a8f733e
commit cb9214d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/spectral_cube/masks.py b/spectral_cube/masks.py
@@ -234,7 +234,8 @@ def _validate_wcs(self, new_data, new_wcs):
         if new_data.shape != self._mask.shape:
             raise ValueError("data shape does not match mask shape")
         if new_wcs not in self._wcs_whitelist:
-            if not wcs_utils.check_equality(new_wcs, self._wcs):
+            if not wcs_utils.check_equality(new_wcs, self._wcs,
+                                            warn_missing=True):
                 raise ValueError("WCS does not match mask WCS")
         self._wcs_whitelist.add(new_wcs)
 
@@ -308,7 +309,8 @@ def _validate_wcs(self, new_data, new_wcs):
         if new_data.shape != self._data.shape:
             raise ValueError("data shape does not match mask shape")
         if new_wcs not in self._wcs_whitelist:
-            if not wcs_utils.check_equality(new_wcs, self._wcs):
+            if not wcs_utils.check_equality(new_wcs, self._wcs,
+                                            warn_missing=True):
                 raise ValueError("WCS does not match mask WCS")
         self._wcs_whitelist.add(new_wcs)
 

diff --git a/spectral_cube/wcs_utils.py b/spectral_cube/wcs_utils.py
@@ -215,6 +215,13 @@ def check_equality(wcs1, wcs2, warn_missing=False, verbose=False):
                     OK = False
                     if verbose:
                         print("Header 1, {0}: {1} != {2}".format(key,u1,u2))
+            elif isinstance(c1[1], (float, np.float)):
+                try:
+                    np.testing.assert_almost_equal(c1[1], c2[1])
+                except AssertionError:
+                    if verbose:
+                        print("Header 1, {0}: {1} != {2}".format(key,c1[1],c2[1]))
+                    OK = False
             elif c1[1] != c2[1]:
                 if verbose:
                     print("Header 1, {0}: {1} != {2}".format(key,c1[1],c2[1]))