split test and removed try blocks

Author: JamesAmato

tests/test_cmb.py

@@ -76,7 +76,11 @@ def test_cmb_lensed(model_tag, freq):
 
 
 @pytest.mark.parametrize("freq", [100])
-def test_cmb_lensed_l01(freq):
+def test_cmb_lensed_with_patch_object(freq):
+    # The CMBLensed Model expects the CAMB power spectrum output to 
+    # begin at l=2, resulting misalignment of ells when it is not 
+    # included. To test the fix, the method must be patched.
+    # This test shows that patching works, complementing test_cmb_lensed_l01.
 
     model_number = 5
     expected_output = pysm3.read_map(
@@ -93,7 +97,6 @@ def test_cmb_lensed_l01(freq):
     c1_delens_l = temp_model.read_txt('pysm_2/delens_ells.txt',
                                       unpack=True)
 
-    # This portion should always pass
     with patch.object(target=pysm3.models.cmb.CMBLensed, 
                       attribute="read_txt", 
                       side_effect=[c1_spectra, c1_delens_l]):
@@ -106,16 +109,34 @@ def test_cmb_lensed_l01(freq):
         )
         model = pysm3.Sky(nside=64, component_objects=[c1])
 
-        try:
-            assert_quantity_allclose(
-                expected_output, 
-                model.get_emission(freq * u.GHz), 
-                rtol=1e-5
-            )
-        except AssertionError:
-            pytest.fail(f"Unexpected AssertionError. Superfail.")
+        assert_quantity_allclose(
+            expected_output, 
+            model.get_emission(freq * u.GHz), 
+            rtol=1e-5
+        )
+
+
+@pytest.mark.parametrize("freq", [100])
+def test_cmb_lensed_l01(freq):
+    # The CMBLensed Model expects the CAMB power spectrum output to 
+    # begin at l=2, resulting misalignment of ells when it is not 
+    # included. This test shows that the fix works, by changing the 
+    # input cls from the original test (test_cmb_lensed) to include l=0,1.
+
+    model_number = 5
+    expected_output = pysm3.read_map(
+        f"pysm_2_test_data/check{model_number}cmb_{freq}p0_64.fits",
+        64,
+        unit="uK_RJ",
+        field=(0, 1, 2),
+    )
 
-    # This portion should pass only with the fix
+    # Use a temporary model to get access to the read_txt method
+    temp_model = pysm3.Model(nside=64)
+    c1_spectra = temp_model.read_txt('pysm_2/camb_lenspotentialCls.dat',
+                                     unpack=True)
+    c1_delens_l = temp_model.read_txt('pysm_2/delens_ells.txt',
+                                      unpack=True)
 
     # Add rows of 0s for l=0,1
     c1_spectra_l01 = np.zeros((c1_spectra.shape[0], c1_spectra.shape[1] + 2))