Adjust Mask class so that tests pass

astropy · Nov 7, 2016 · 50a57eb · 50a57eb
1 parent bd03250
commit 50a57eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/regions/core/mask.py b/regions/core/mask.py
@@ -1,3 +1,5 @@
+import numpy as np
+
 __all__ = ['Mask']
 
 
@@ -18,15 +20,12 @@ class Mask(object):
         minimal bounding box.
     """
 
-    def __init__(self, mask, bbox_slice):
+    def __init__(self, mask, origin):
+
         self.data = np.asanyarray(mask)
         self.shape = mask.shape
-        self.slices = bbox_slice
-
-        dy = bbox_slice[0].stop - bbox_slice[0].start
-        dx = bbox_slice[1].stop - bbox_slice[1].start
-        if self.data.shape != (dy, dx):
-            raise ValueError('mask shape and bbox_slice do not agree.')
+        self.slices = (slice(origin[0], origin[0] + self.shape[0]),
+                       slice(origin[1], origin[1] + self.shape[1]))
 
     @property
     def array(self):

diff --git a/regions/shapes/tests/test_circle.py b/regions/shapes/tests/test_circle.py
@@ -92,4 +92,4 @@ def test_to_mask():
     center = PixCoord(3, 4)
     reg = CirclePixelRegion(center, 2)
     mask = reg.to_mask(mode='exact')
-    assert_allclose(np.sum(mask.mask), 4 * np.pi)
+    assert_allclose(np.sum(mask.data), 4 * np.pi)