Merge pull request #4722 from Astro-Kirsty/fix_get_overlap_fraction

Fix get_overlap_fraction for different energies
gammapy · Aug 25, 2023 · eb87310 · eb87310
2 parents 2be59e6 + 3d003b0
commit eb87310
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/gammapy/irf/edisp/map.py b/gammapy/irf/edisp/map.py
@@ -17,7 +17,7 @@ def get_overlap_fraction(energy_axis, energy_axis_true):
 
     xmin = np.fmin(a_max, b_max)
     xmax = np.fmax(a_min, b_min)
-    return np.clip(xmin - xmax, 0, np.inf) / (b_max - b_min)
+    return (np.clip(xmin - xmax, 0, np.inf) / (b_max - b_min)).to("")
 
 
 class EDispMap(IRFMap):

diff --git a/gammapy/irf/edisp/tests/test_kernel.py b/gammapy/irf/edisp/tests/test_kernel.py
@@ -35,6 +35,12 @@ def test_from_diagonal_response(self):
 
         assert_equal(edisp.pdf_matrix, expected)
 
+        # Test with different energy units
+        energy_axis = MapAxis.from_energy_edges([2000, 4000, 6000] * u.GeV)
+        edisp = EDispKernel.from_diagonal_response(energy_axis_true, energy_axis)
+        assert edisp.pdf_matrix.shape == (4, 2)
+        assert_allclose(edisp.pdf_matrix, expected, atol=1e-5)
+
         # Test square matrix
         edisp = EDispKernel.from_diagonal_response(energy_axis_true)
         assert_allclose(edisp.axes["energy"].edges, edisp.axes["energy_true"].edges)

diff --git a/gammapy/irf/edisp/tests/test_map.py b/gammapy/irf/edisp/tests/test_map.py
@@ -224,7 +224,7 @@ def test_edisp_kernel_map_stack():
     assert_allclose(exposure, 3.0)
 
 
-def test__incorrect_edisp_kernel_map_stack():
+def test_incorrect_edisp_kernel_map_stack():
     energy_axis = MapAxis.from_energy_bounds("1 TeV", "10 TeV", nbin=5)
 
     energy_axis_true = MapAxis.from_energy_bounds(