only necessary changes.

spacetelescope · Sep 3, 2024 · 59fa5e2 · 59fa5e2
1 parent a414a05
commit 59fa5e2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/stwcs/distortion/models.py b/stwcs/distortion/models.py
@@ -247,8 +247,8 @@ def __init__(self, idcfile, date=None, chip=1, direction='forward',
             self.refpix['PSCALE'] = np.float64(self.refpix['PSCALE']) * binned
             self.cx = self.cx * binned
             self.cy = self.cy * binned
-            self.refpix['XREF'] = np.float64(self.refpix['XREF']) / binned
-            self.refpix['YREF'] = np.float64(self.refpix['YREF']) / binned
+            self.refpix['XREF'] = self.refpix['XREF'] / binned
+            self.refpix['YREF'] = self.refpix['YREF'] / binned
             self.refpix['XSIZE'] = self.refpix['XSIZE'] / binned
             self.refpix['YSIZE'] = self.refpix['YSIZE'] / binned
 

diff --git a/stwcs/updatewcs/makewcs.py b/stwcs/updatewcs/makewcs.py
@@ -46,8 +46,8 @@ def updateWCS(cls, ext_wcs, ref_wcs):
             return {}
 
         # promote scalars manually for Numpy 2.0+
-        ext_wcs = utils.promote_idctab_floats(ext_wcs)
-        ref_wcs = utils.promote_idctab_floats(ref_wcs)
+        ext_wcs.idcmodel.refpix['PSCALE'] = np.float64(ext_wcs.idcmodel.refpix['PSCALE'])
+        ref_wcs.idcmodel.refpix['PSCALE'] = np.float64(ref_wcs.idcmodel.refpix['PSCALE'])
 
         ltvoff, offshift = cls.getOffsets(ext_wcs)
 

diff --git a/stwcs/updatewcs/utils.py b/stwcs/updatewcs/utils.py
@@ -1,21 +1,9 @@
 import os
-import numpy as np
 from stsci.tools import fileutil
 
 import logging
 logger = logging.getLogger("stwcs.updatewcs.utils")
 
-def promote_idctab_floats(wcs):
-    """
-    Promote scalars properly in Numpy 2.0, which was
-    automated in Numpy <2.0. Keys are values in the IDCTAB.
-    """
-    keys = ['PSCALE', 'XREF', 'YREF', 'THETA']
-    for key in keys:
-        if wcs.idcmodel.refpix[key]:
-            wcs.idcmodel.refpix[key] = np.float64(wcs.idcmodel.refpix[key])
-    return wcs
-
 
 def diff_angles(a, b):
     """