Remove deprecation warning

Signed-off-by: Astro-Kirsty <AstroKirsty@gmail.com>

gammapy/datasets/tests/test_map.py

@@ -45,7 +45,6 @@
     SkyModel,
     UniformPrior,
 )
-from gammapy.utils.deprecation import GammapyDeprecationWarning
 from gammapy.utils.testing import mpl_plot_check, requires_data, requires_dependency
 from gammapy.utils.types import JsonQuantityEncoder
 
@@ -542,22 +541,21 @@ def test_downsample_energy(geom, geom_etrue):
     mask.data[1:] = True
     counts += 1
     exposure = Map.from_geom(geom_etrue, unit="m2s")
-    with pytest.raises(GammapyDeprecationWarning):
-        edisp = EDispKernelMap.from_gauss(geom.axes[0], geom_etrue.axes[0], 0.1, 0.0)
-        dataset = MapDataset(
-            counts=counts,
-            exposure=exposure,
-            mask_safe=mask,
-            edisp=edisp,
-        )
-        dataset_downsampled = dataset.downsample(2, axis_name="energy")
-        dataset_resampled = dataset.resample_energy_axis(geom.axes[0].downsample(2))
+    edisp = EDispKernelMap.from_gauss(geom.axes[0], geom_etrue.axes[0], 0.1, 0.0)
+    dataset = MapDataset(
+        counts=counts,
+        exposure=exposure,
+        mask_safe=mask,
+        edisp=edisp,
+    )
+    dataset_downsampled = dataset.downsample(2, axis_name="energy")
+    dataset_resampled = dataset.resample_energy_axis(geom.axes[0].downsample(2))
 
-        assert dataset_downsampled.edisp.edisp_map.data.shape == (3, 1, 1, 2)
-        assert_allclose(
-            dataset_downsampled.edisp.edisp_map.data[:, :, 0, 0],
-            dataset_resampled.edisp.edisp_map.data[:, :, 0, 0],
-        )
+    assert dataset_downsampled.edisp.edisp_map.data.shape == (3, 1, 1, 2)
+    assert_allclose(
+        dataset_downsampled.edisp.edisp_map.data[:, :, 0, 0],
+        dataset_resampled.edisp.edisp_map.data[:, :, 0, 0],
+    )
 
 
 @requires_data()

gammapy/datasets/tests/test_spectrum.py

@@ -20,7 +20,6 @@
     PowerLawSpectralModel,
     SkyModel,
 )
-from gammapy.utils.deprecation import GammapyDeprecationWarning
 from gammapy.utils.random import get_random_state
 from gammapy.utils.regions import compound_region_to_regions
 from gammapy.utils.testing import assert_time_allclose, mpl_plot_check, requires_data
@@ -296,73 +295,68 @@ def test_spectrum_dataset_stack_nondiagonal_no_bkg(spectrum_dataset):
     energy = spectrum_dataset.counts.geom.axes["energy"]
     geom = spectrum_dataset.counts.geom
 
-    with pytest.raises(GammapyDeprecationWarning):
-        edisp1 = EDispKernelMap.from_gauss(
-            energy_axis=energy,
-            energy_axis_true=energy.copy(name="energy_true"),
-            sigma=0.1,
-            bias=0,
-            geom=geom.to_image(),
-        )
-        edisp1.exposure_map.data += 1
+    edisp1 = EDispKernelMap.from_gauss(
+        energy_axis=energy,
+        energy_axis_true=energy.copy(name="energy_true"),
+        sigma=0.1,
+        bias=0,
+        geom=geom.to_image(),
+    )
+    edisp1.exposure_map.data += 1
 
-        aeff = EffectiveAreaTable2D.from_parametrization(
-            energy_axis_true=energy.copy(name="energy_true"), instrument="HESS"
-        )
+    aeff = EffectiveAreaTable2D.from_parametrization(
+        energy_axis_true=energy.copy(name="energy_true"), instrument="HESS"
+    )
 
-        livetime = 100 * u.s
+    livetime = 100 * u.s
 
-        geom_true = geom.as_energy_true
-        exposure = make_map_exposure_true_energy(
-            geom=geom_true,
-            livetime=livetime,
-            pointing=geom_true.center_skydir,
-            aeff=aeff,
-        )
+    geom_true = geom.as_energy_true
+    exposure = make_map_exposure_true_energy(
+        geom=geom_true, livetime=livetime, pointing=geom_true.center_skydir, aeff=aeff
+    )
 
-        geom = spectrum_dataset.counts.geom
-        counts = RegionNDMap.from_geom(geom=geom)
+    geom = spectrum_dataset.counts.geom
+    counts = RegionNDMap.from_geom(geom=geom)
 
-        gti = GTI.create(start=0 * u.s, stop=livetime)
-        spectrum_dataset1 = SpectrumDataset(
-            counts=counts,
-            exposure=exposure,
-            edisp=edisp1,
-            meta_table=Table({"OBS_ID": [0]}),
-            gti=gti.copy(),
-        )
+    gti = GTI.create(start=0 * u.s, stop=livetime)
+    spectrum_dataset1 = SpectrumDataset(
+        counts=counts,
+        exposure=exposure,
+        edisp=edisp1,
+        meta_table=Table({"OBS_ID": [0]}),
+        gti=gti.copy(),
+    )
 
-    with pytest.raises(GammapyDeprecationWarning):
-        edisp2 = EDispKernelMap.from_gauss(
-            energy_axis=energy,
-            energy_axis_true=energy.copy(name="energy_true"),
-            sigma=0.2,
-            bias=0.0,
-            geom=geom,
-        )
-        edisp2.exposure_map.data += 1
+    edisp2 = EDispKernelMap.from_gauss(
+        energy_axis=energy,
+        energy_axis_true=energy.copy(name="energy_true"),
+        sigma=0.2,
+        bias=0.0,
+        geom=geom,
+    )
+    edisp2.exposure_map.data += 1
 
-        gti2 = GTI.create(start=100 * u.s, stop=200 * u.s)
+    gti2 = GTI.create(start=100 * u.s, stop=200 * u.s)
 
-        spectrum_dataset2 = SpectrumDataset(
-            counts=counts,
-            exposure=exposure.copy(),
-            edisp=edisp2,
-            meta_table=Table({"OBS_ID": [1]}),
-            gti=gti2,
-        )
-        spectrum_dataset1.stack(spectrum_dataset2)
+    spectrum_dataset2 = SpectrumDataset(
+        counts=counts,
+        exposure=exposure.copy(),
+        edisp=edisp2,
+        meta_table=Table({"OBS_ID": [1]}),
+        gti=gti2,
+    )
+    spectrum_dataset1.stack(spectrum_dataset2)
 
-        assert_allclose(spectrum_dataset1.meta_table["OBS_ID"][0], [0, 1])
+    assert_allclose(spectrum_dataset1.meta_table["OBS_ID"][0], [0, 1])
 
-        assert spectrum_dataset1.background_model is None
-        assert_allclose(spectrum_dataset1.gti.time_sum.to_value("s"), 200)
-        assert_allclose(
-            spectrum_dataset1.exposure.quantity[2].to_value("m2 s"), 1573851.079861
-        )
-        kernel = edisp1.get_edisp_kernel()
-        assert_allclose(kernel.get_bias(1 * u.TeV), 0.0, atol=1.2e-3)
-        assert_allclose(kernel.get_resolution(1 * u.TeV), 0.1581, atol=1e-2)
+    assert spectrum_dataset1.background_model is None
+    assert_allclose(spectrum_dataset1.gti.time_sum.to_value("s"), 200)
+    assert_allclose(
+        spectrum_dataset1.exposure.quantity[2].to_value("m2 s"), 1573851.079861
+    )
+    kernel = edisp1.get_edisp_kernel()
+    assert_allclose(kernel.get_bias(1 * u.TeV), 0.0, atol=1.2e-3)
+    assert_allclose(kernel.get_resolution(1 * u.TeV), 0.1581, atol=1e-2)
 
 
 def test_peek(spectrum_dataset):

gammapy/irf/edisp/core.py

@@ -4,11 +4,10 @@
 import scipy.special
 from astropy import units as u
 from astropy.coordinates import Angle, SkyCoord
-from astropy.units import Quantity
 from astropy.visualization import quantity_support
 import matplotlib.pyplot as plt
 from matplotlib.colors import PowerNorm
-from gammapy.maps import MapAxes, MapAxis, RegionGeom
+from gammapy.maps import MapAxes, RegionGeom
 from gammapy.utils.deprecation import deprecated_renamed_argument
 from gammapy.visualization.utils import add_colorbar
 from ..core import IRF
@@ -154,21 +153,6 @@ def to_edisp_kernel(self, offset, energy_axis_true=None, energy_axis=None):
 
         offset = Angle(offset)
 
-        if isinstance(energy_axis, Quantity):
-            log.warning(
-                "From v1.3 energy_axis should be given as a MapAxis, not a Quantity."
-            )
-            energy_axis = MapAxis.from_energy_edges(energy_axis)
-
-        if isinstance(energy_axis_true, Quantity):
-            log.warning(
-                "From v1.3 energy_axis_true should be given as a MapAxis, not a Quantity."
-            )
-            energy_axis_true = MapAxis.from_energy_edges(
-                energy_axis_true,
-                name="energy_true",
-            )
-
         if energy_axis is None:
             energy_axis = self.axes["energy_true"].copy(name="energy")
 

gammapy/irf/edisp/kernel.py

@@ -150,7 +150,7 @@ def from_gauss(cls, energy_axis_true, energy_axis, sigma, bias, pdf_threshold=1e
             pdf_threshold=pdf_threshold,
         )
         return edisp.to_edisp_kernel(
-            offset=offset_axis.center[0], energy=energy_axis.edges
+            offset=offset_axis.center[0], energy_axis=energy_axis
         )
 
     @classmethod