Fix failing tests

Author: bhilbert4

environment_python_3.11.yml

@@ -8,29 +8,28 @@ dependencies:
 - pip
 - python==3.11.13
 - pip:
-    - asdf==4.5.0
-    - astropy==7.1.0
+    - asdf==5.3.0
+    - astropy==7.2.0
     - astroquery==0.4.11
     - batman-package>=2.5.2
-    - bokeh==3.8.0
-    - crds==13.0.6
-    - grismconf==1.51
-    - h5py==3.14.0
+    - bokeh==3.9.0
+    - crds==13.1.6
+    - grismconf>=1.60
+    - h5py==3.16.0
     - hotsoss==0.1.10
-    - ipython==9.6.0
-    - jupyter==1.1.1
-    - jwst==1.19.2
+    - jwst==2.0.0
     - jwst-backgrounds==1.3.0
     - jwst_gtvt==1.1.1
-    - lxml==6.0.2
-    - matplotlib==3.10.7
+    - lxml==6.1.0
+    - matplotlib==3.10.9
     - nircam_gsim>=1.71
-    - numpy==2.2.6
+    - numpy==2.3.5
     - photutils==2.3.0
-    - pysiaf==0.24.1
-    - pytest==8.4.2
+    - pysiaf>=0.25.1
+    - pytest==9.0.3
     - pyyaml==6.0.3
-    - scipy==1.16.2
-    - sphinx==8.2.3
-    - synphot==1.6.0
-    - webbpsf==2.0.0
+    - scipy==1.17.1
+    - setuptools==81.0.0
+    - sphinx==9.1.0
+    - stpsf==2.2.0
+    - synphot==1.7.0

environment_python_3.12.yml

@@ -8,28 +8,28 @@ dependencies:
 - pip
 - python==3.12.11
 - pip:
-    - asdf==4.5.0
-    - astropy==7.1.0
+    - asdf==5.3.0
+    - astropy==7.2.0
     - astroquery==0.4.11
-    - bokeh==3.8.0
-    - crds==13.0.6
-    - grismconf==1.51
-    - h5py==3.14.0
+    - batman-package>=2.5.2
+    - bokeh==3.9.0
+    - crds==13.1.6
+    - grismconf>=1.60
+    - h5py==3.16.0
     - hotsoss==0.1.10
-    - ipython==9.6.0
-    - jupyter==1.1.1
-    - jwst==1.19.2
+    - jwst==2.0.0
     - jwst-backgrounds==1.3.0
     - jwst_gtvt==1.1.1
-    - lxml==6.0.2
-    - matplotlib==3.10.7
+    - lxml==6.1.0
+    - matplotlib==3.10.9
     - nircam_gsim>=1.71
-    - numpy==2.2.6
+    - numpy==2.3.5
     - photutils==2.3.0
-    - pysiaf==0.24.1
-    - pytest==8.4.2
+    - pysiaf>=0.25.1
+    - pytest==9.0.3
     - pyyaml==6.0.3
-    - scipy==1.16.2
-    - sphinx==8.2.3
-    - synphot==1.6.0
-    - webbpsf==2.0.0
+    - scipy==1.17.1
+    - setuptools==81.0.0
+    - sphinx==9.1.0
+    - stpsf==2.2.0
+    - synphot==1.7.0

mirage/psf/deployments.py

@@ -20,7 +20,7 @@
 
 from astropy.io import fits
 import numpy as np
-import webbpsf
+import stpsf as webbpsf
 
 from mirage.logging import logging_functions
 from mirage.utils.constants import LOG_CONFIG_FILENAME, STANDARD_LOGFILE_NAME

mirage/psf/psf_selection.py

@@ -37,7 +37,7 @@
 
 from astropy.io import fits
 import numpy as np
-from webbpsf.utils import to_griddedpsfmodel
+from stpsf.utils import to_griddedpsfmodel
 
 from mirage.logging import logging_functions
 from mirage.utils.constants import NIRISS_PUPIL_WHEEL_FILTERS, NIRCAM_PUPIL_WHEEL_FILTERS, \

mirage/psf/segment_psfs.py

@@ -26,9 +26,9 @@
 from astropy.io import fits
 import numpy as np
 import pysiaf
-import webbpsf
-from webbpsf.gridded_library import CreatePSFLibrary
-from webbpsf.utils import to_griddedpsfmodel
+import stpsf
+from stpsf.gridded_library import CreatePSFLibrary
+from stpsf.utils import to_griddedpsfmodel
 
 import multiprocessing
 import functools
@@ -56,7 +56,7 @@ def _generate_psfs_for_one_segment(inst, ote, segment_tilts, out_dir, boresight,
 
     i_segment = i + 1
 
-    segname = webbpsf.webbpsf_core.segname(i_segment)
+    segname = stpsf.stpsf_core.segname(i_segment)
     logger.info('GENERATING SEGMENT {} DATA'.format(segname))
 
     det_filt_match = False
@@ -76,12 +76,12 @@ def _generate_psfs_for_one_segment(inst, ote, segment_tilts, out_dir, boresight,
             inst.detector = det
 
             # Restrict the pupil to the current segment
-            pupil = webbpsf.webbpsf_core.one_segment_pupil(i_segment)
+            pupil = stpsf.stpsf_core.one_segment_pupil(i_segment)
             ote.amplitude = pupil[0].data
             inst.pupil = ote
 
             # Determine normalization factor - what fraction of total pupil is in this one segment?
-            full_pupil = fits.getdata(os.path.join(webbpsf.utils.get_webbpsf_data_path(), 'jwst_pupil_RevW_npix1024.fits.gz'))
+            full_pupil = fits.getdata(os.path.join(stpsf.utils.get_stpsf_data_path(), 'jwst_pupil_RevW_npix1024.fits.gz'))
             pupil_fraction_for_this_segment = pupil[0].data.sum() / full_pupil.sum()
 
             # Generate the PSF grid
@@ -192,9 +192,9 @@ def generate_segment_psfs(ote, segment_tilts, out_dir, filters=['F212N', 'F480M'
 
     # Create webbpsf NIRCam instance
     if instrument.lower() == 'nircam':
-        inst = webbpsf.NIRCam()
+        inst = stpsf.NIRCam()
     elif instrument.lower() == 'fgs':
-        inst = webbpsf.FGS()
+        inst = stpsf.FGS()
     else:
         raise ValueError(f'Unsupported instrument: {instrument}')
 
@@ -455,7 +455,7 @@ def get_segment_offset(segment_number, detector, library_list):
     # between different OTE pose terms into optical tip and tilt. In particular, this is needed for
     # accurate modeling of radial translation corrections when using incoherent PSF calculations.
     if f'S{segment_number:02d}XTILT' in header:
-        hexike_to_arcsec = 206265/webbpsf.constants.JWST_SEGMENT_RADIUS
+        hexike_to_arcsec = 206265/stpsf.constants.JWST_SEGMENT_RADIUS
         # recall that Hexike tilt _around the X axis_ produces an offset _into Y_, and vice versa.
         x_arcsec =  np.float64(header[f'S{segment_number:02d}YTILT'] * hexike_to_arcsec)
         # also recall coord flip of Y axis from OTE L.O.M in entrance pupil to exit pupil

mirage/psf/soss_trace.py

@@ -194,7 +194,7 @@ def generate_SOSS_psfs(filt):
         The filter to use, ['CLEAR', 'F277W']
     """
     try:
-        import webbpsf
+        import stpsf as webbpsf
 
     except ImportError:
         raise ("Could not import `webbpsf` package. Functionality limited. Generating dummy file.")

mirage/psf/tools.py

@@ -10,7 +10,7 @@
 from astropy.modeling.models import Gaussian2D
 import numpy as np
 from photutils.datasets import load_irac_psf
-import webbpsf
+import stpsf as webbpsf
 
 from mirage.psf.psf_selection import get_psf_wings
 from mirage.utils.siaf_interface import get_instance

mirage/seed_image/catalog_seed_image.py

@@ -4572,7 +4572,7 @@ def locate_ghost(self, pixel_x, pixel_y, count_rate, magnitude_system, source_ro
                                                                 NIRISS_GHOST_GAP_FILE,
                                                                 log_skipped_filters=log_skipped_filters
                                                                 )
-        if isinstance(ghost_pixelx, np.float):
+        if isinstance(ghost_pixelx, float):
             if not np.isfinite(ghost_pixelx):
                 return np.nan, np.nan, np.nan, np.nan, np.nan
 

mirage/seed_image/get_psf.py

@@ -3,7 +3,7 @@
 *** NOT CURRENTLY IN USE ****
 '''
 
-import webbpsf
+import stpsf as webbpsf
 
 
 def create_commissioning_psf(params):

mirage/utils/backgrounds.py

@@ -302,7 +302,7 @@ def low_medium_high_background_value(ra, dec, background_level, filter_waves, fi
         # Convert from MJy/sr to e-/sec/pixel
         pixelarea = siaf_info.XSciScale * u.arcsec * siaf_info.YSciScale * u.arcsec
         photon_total = PRIMARY_MIRROR_AREA * (filt_bkgd * u.MJy / u.sr) * (1. / PLANCK) * 1.e-20 * pixelarea.to(u.sr) / (filter_waves * u.micron)
-        bsigs[i] = np.trapz(photon_total.value, x=filter_waves)
+        bsigs[i] = np.trapezoid(photon_total.value, x=filter_waves)
 
     # Now sort and determine the low/medium/high levels
     low, medium, high = find_low_med_high(bsigs)