restore include/exclude parameters for spectra

heracles/twopoint.py

@@ -28,7 +28,7 @@
 
 import numpy as np
 
-from .core import TocDict, update_metadata
+from .core import TocDict, toc_match, update_metadata
 from .progress import NoProgress, Progress
 from .result import Result, binned
 
@@ -181,6 +181,8 @@ def angular_power_spectra(
     debias=True,
     bins=None,
     weights=None,
+    include=None,
+    exclude=None,
     out=None,
 ):
     """compute angular power spectra from a set of alms"""
@@ -226,6 +228,10 @@ def angular_power_spectra(
         else:
             swapped = False
 
+        # check if cl is skipped by explicit include or exclude list
+        if not toc_match((k1, k2, i1, i2), include, exclude):
+            continue
+
         logger.info("computing %s x %s cl for bins %s, %s", k1, k2, i1, i2)
 
         # retrieve alms from keys; make sure swap is respected

tests/test_twopoint.py

@@ -137,6 +137,19 @@ def test_angular_power_spectra(mock_alms, lmax):
     for key, cl in cls.items():
         assert cl.shape == comb12[key]
 
+    # include and exclude
+    inc = object()
+    exc = object()
+    with patch("heracles.twopoint.toc_match") as mock_match:
+        mock_match.return_value = False
+        cls = angular_power_spectra(mock_alms1, mock_alms2, include=inc, exclude=exc)
+    assert len(cls) == 0
+    assert mock_match.call_count == len(comb12)
+    call_iter = iter(mock_match.call_args_list)
+    for a, i in mock_alms1:
+        for b, j in mock_alms2:
+            assert next(call_iter) == call((a, b, i, j), inc, exc)
+
 
 def test_debias_cls():
     from heracles.twopoint import debias_cls