Merge branch 'main' into mfarnum/fix-floating-point-issues

romanisim/image.py

@@ -975,8 +975,8 @@ def inject_sources_into_l2(model, cat, x=None, y=None, psf=None, rng=None,
         rng = galsim.UniformDeviate(123)
 
     if x is None or y is None:
-        x, y = model.meta.wcs.numerical_inverse(cat['ra'], cat['dec'],
-                                                with_bounding_box=False)
+        x, y = model.meta.wcs.numerical_inverse(
+            cat['ra'].value, cat['dec'].value, with_bounding_box=False)
 
     filter_name = model.meta.instrument.optical_element
     cat = catalog.table_to_catalog(cat, [filter_name])

romanisim/l3.py

@@ -142,7 +142,7 @@ def inject_sources_into_l3(model, cat, x=None, y=None, psf=None, rng=None,
         rng = galsim.UniformDeviate(seed)
 
     if x is None or y is None:
-        x, y = model.meta.wcs.numerical_inverse(cat['ra'], cat['dec'],
+        x, y = model.meta.wcs.numerical_inverse(cat['ra'].value, cat['dec'].value,
                                                 with_bounding_box=False)
 
     filter_name = model.meta.basic.optical_element
@@ -756,7 +756,7 @@ def add_more_metadata(metadata, efftimes, filter_name, wcs, shape, nexposures):
     metadata['resample']['pointings'] = nexposures
     metadata['resample']['product_exposure_time'] = (
         metadata['basic']['max_exposure_time'])
-    xref, yref = wcs.world_to_pixel(
+    xref, yref = wcs.world_to_pixel_values(
         metadata['wcsinfo']['ra_ref'], metadata['wcsinfo']['dec_ref'])
     metadata['wcsinfo']['x_ref'] = xref
     metadata['wcsinfo']['y_ref'] = yref

romanisim/tests/test_l3.py

@@ -161,7 +161,7 @@ def test_sim_mosaic():
 
     # Create bounds from the object list
     twcs = romanisim.wcs.get_mosaic_wcs(metadata)
-    allx, ally = twcs.world_to_pixel(cat['ra'], cat['dec'])
+    allx, ally = twcs.world_to_pixel_values(cat['ra'].value, cat['dec'].value)
 
     # Obtain the sample extremums
     xmin = min(allx)
@@ -170,7 +170,7 @@ def test_sim_mosaic():
     ymax = max(ally)
 
     # Obtain WCS center
-    xcen, ycen = twcs.world_to_pixel(ra_ref, dec_ref)
+    xcen, ycen = twcs.world_to_pixel_values(ra_ref, dec_ref)
 
     # Determine maximum extremums from WCS center
     xdiff = max([math.ceil(xmax - xcen), math.ceil(xcen - xmin)]) + 1
@@ -191,7 +191,8 @@ def test_sim_mosaic():
     assert len(extras['objinfo']) == len(cat)
 
     # Ensure center pixel of bright objects is bright
-    x_all, y_all = moswcs.world_to_pixel(cat['ra'][:10], cat['dec'][:10])
+    x_all, y_all = moswcs.world_to_pixel_values(cat['ra'][:10].value,
+                                                cat['dec'][:10].value)
     for x, y in zip(x_all, y_all):
         x = int(x)
         y = int(y)
@@ -581,7 +582,7 @@ def test_scaling():
     # pixel scales are different by a factor of two.
     fluxes = []
     for im, fac in zip((im1, im2, im3), (1, 2, 1)):
-        pix = im.meta.wcs.world_to_pixel(
+        pix = im.meta.wcs.world_to_pixel_values(
             imdict['tabcatalog']['ra'][0], imdict['tabcatalog']['dec'][0])
         pind = [int(x) for x in pix]
         margin = 30 * fac

romanisim/util.py

@@ -516,8 +516,9 @@ def update_photom_keywords(im, gain=None):
     if 'wcs' in im['meta']:
         wcs = im['meta']['wcs']
         cenpix = (im.data.shape[0] // 2, im.data.shape[1] // 2)
-        cc = wcs.pixel_to_world((cenpix[0], cenpix[0], cenpix[0] + 1),
-                                (cenpix[1], cenpix[1] + 1, cenpix[1]))
+        cc = wcs.pixel_to_world(
+            (cenpix[0], cenpix[0], cenpix[0] + 1),
+            (cenpix[1], cenpix[1] + 1, cenpix[1]))
         angle = (cc[0].position_angle(cc[1]) -
                  cc[0].position_angle(cc[2]))
         area = (cc[0].separation(cc[1]) * cc[0].separation(cc[2])

romanisim/wcs.py

@@ -374,7 +374,7 @@ def coeffs_to_poly(mat, degree):
     # convention in the galsim CelestialWCS object, we delete that here.
     # Success is defined by
     # (GWCS._radec(x, y) ==
-    #  wcs_from_fits_header(GWCS.header.header).pixel_to_world(x, y))
+    #  wcs_from_fits_header(GWCS.header.header).pixel_to_world_values(x, y))
 
     cd = w.wcs.piximg_matrix