From ab1d205d2bfb932b9ca2cd016633fdd1eb364a70 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 13 Oct 2023 16:29:11 -0400 Subject: [PATCH] import GriddedPSFModel from photutils.psf --- webbpsf/gridded_library.py | 7 +++++-- webbpsf/utils.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webbpsf/gridded_library.py b/webbpsf/gridded_library.py index da61f3d6..6a852797 100644 --- a/webbpsf/gridded_library.py +++ b/webbpsf/gridded_library.py @@ -427,9 +427,12 @@ def to_model(data, meta): and oversampling keys """ try: - from photutils import GriddedPSFModel + from photutils.psf import GriddedPSFModel except ImportError: - raise ImportError("This method requires photutils >= 0.6") + try: + from photutils import GriddedPSFModel + except ImportError: + raise ImportError("This method requires photutils >= 0.6") ndd = NDData(data, meta=meta, copy=True) diff --git a/webbpsf/utils.py b/webbpsf/utils.py index fff9e6d5..3cce54e5 100644 --- a/webbpsf/utils.py +++ b/webbpsf/utils.py @@ -834,9 +834,12 @@ def to_griddedpsfmodel(HDUlist_or_filename=None, ext_data=0, ext_header=0): grid_xypos and oversampling keys """ try: - from photutils import GriddedPSFModel + from photutils.psf import GriddedPSFModel except ImportError: - raise ImportError("This method requires photutils >= 0.6") + try: + from photutils import GriddedPSFModel + except ImportError: + raise ImportError("This method requires photutils >= 0.6") if isinstance(HDUlist_or_filename, str): HDUlist = fits.open(HDUlist_or_filename)