Merge pull request #5167 from QRemy/fix_4FGL_to_models

Fix SourceCatalogObject4FGL.to_models() for DR4
gammapy · Mar 19, 2024 · 86488ec · 86488ec
2 parents 637ecec + 7e8371f
commit 86488ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/gammapy/catalog/fermi.py b/gammapy/catalog/fermi.py
@@ -377,9 +377,13 @@ def spatial_model(self):
                 if de["version"] < 28:
                     path_extended = "$GAMMAPY_DATA/catalogs/fermi/LAT_extended_sources_8years/Templates/"
                 elif de["version"] < 32:
-                    path_extended = "$GAMMAPY_DATA/catalogs/fermi/LAT_extended_sources_12years/Templates/"
+                    path_extended = (
+                        "$GAMMAPY_DATA/catalogs/fermi/Extended_12years/Templates/"
+                    )
                 else:
-                    path_extended = "$GAMMAPY_DATA/catalogs/fermi/LAT_extended_sources_14years/Templates/"
+                    path_extended = (
+                        "$GAMMAPY_DATA/catalogs/fermi/Extended_14years/Templates/"
+                    )
                 path = make_path(path_extended)
                 with warnings.catch_warnings():  # ignore FITS units warnings
                     warnings.simplefilter("ignore", FITSFixedWarning)

diff --git a/gammapy/catalog/tests/test_fermi.py b/gammapy/catalog/tests/test_fermi.py
@@ -145,6 +145,9 @@ def test_4FGL_DR4():
     model_dnde = model(fp.energy_ref[not_ul])
     assert_quantity_allclose(model_dnde, fp_dnde, rtol=0.07)
 
+    models = cat.to_models()
+    assert len(models) == len(cat.table)
+
 
 @requires_data()
 class TestFermi4FGLObject:

diff --git a/gammapy/modeling/models/spatial.py b/gammapy/modeling/models/spatial.py
@@ -1323,7 +1323,10 @@ def __init__(
                 data_sum = map.data.sum(axis=(1, 2)).reshape((-1, 1, 1))
 
             data = np.divide(
-                map.data, data_sum, out=np.zeros_like(map.data), where=data_sum != 0
+                map.data.astype(float),
+                data_sum,
+                out=np.zeros_like(map.data, dtype=float),
+                where=data_sum != 0,
             )
             data /= map.geom.solid_angle().to_value("sr")
             map = map.copy(data=data, unit="sr-1")