fix: zero order cells in moc creation from healpix cells are re-instated

cds-astro · Jul 18, 2024 · b37715e · b37715e
1 parent 557a4b0
commit b37715e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.16.1]
+
+### Fixed
+
+* `from_healpix_cells` and `from_valued_healpix_cells` accept order zero cells again
+
 ## [0.16.0]
 
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "MOCPy"
-version = "0.16.0"
+version = "0.16.1"
 authors = [
   "Matthieu Baumann <[email protected]>",
   "Thomas Boch <[email protected]>",

diff --git a/codemeta.json b/codemeta.json
@@ -9,8 +9,8 @@
     "dateModified": "2023-12-04",
     "issueTracker": "https://github.com/cds-astro/mocpy/issues",
     "name": "MOCpy",
-    "version": "0.16.0",
-    "softwareVersion": "0.16.0",
+    "version": "0.16.1",
+    "softwareVersion": "0.16.1",
     "description": "Python library to easily create and manipulate MOCs (Multi-Order Coverage maps)",
     "applicationCategory": ["Astronomy", "Science"],
     "funding": "ESCAPE 824064, ASTERICS 653477",

diff --git a/python/mocpy/moc/moc.py b/python/mocpy/moc/moc.py
@@ -91,7 +91,7 @@ def _mask_unsigned_before_casting(indices):
     indices : `numpy.ndarray` or Iterable
     """
     if np.issubdtype(np.asarray(indices).dtype, np.unsignedinteger) or all(
-        np.asarray(indices) > 0,
+        np.asarray(indices) >= 0,
     ):
         return None
     warnings.warn(
@@ -100,7 +100,7 @@ def _mask_unsigned_before_casting(indices):
         UserWarning,
         stacklevel=2,
     )
-    return np.array(indices) > 0
+    return np.array(indices) >= 0
 
 
 def _extract_mask_and_values_multiordermap(multiordermap, column):

diff --git a/python/mocpy/tests/test_moc.py b/python/mocpy/tests/test_moc.py
@@ -264,6 +264,8 @@ def test_from_healpix_cells():
     ):
         moc = MOC.from_healpix_cells(ipix=[40, -1, 65], depth=depth, max_depth=3)
     assert moc == MOC.from_str("3/40 65")
+    # also allow order zero (regression for issue #157)
+    assert MOC.from_healpix_cells(np.array([0]), 0, 0) == MOC.from_str("0/0")
 
 
 def test_from_polygons():

diff --git a/python/mocpy/version.py b/python/mocpy/version.py
@@ -1 +1 @@
-__version__ = "0.16.0"
+__version__ = "0.16.1"