roman-snpit-snappl 0.7.0__tar.gz → 0.8.0__tar.gz

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/.github/workflows/run_snappl_tests.yml

@@ -20,10 +20,20 @@ jobs:
         uses: jwalton/gh-docker-logs@v2
 
       - name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
+          path: main
           submodules: recursive
 
+      - name: run ruff
+        uses: astral-sh/ruff-action@v3
+          
+      - name: checkout photometry test data
+        uses: actions/checkout@v5
+        with:
+          repository: Roman-Supernova-PIT/photometry_test_data
+          path: photometry_test_data
+          
       - name: log into github container registry
         uses: docker/login-action@v3
         with:
@@ -46,4 +56,5 @@ jobs:
 
       - name: run test
         run: |
+          cd main
           docker compose run runtests

{roman_snpit_snappl-0.7.0/roman_snpit_snappl.egg-info → roman_snpit_snappl-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.7.0
+Version: 0.8.0
 Summary: Photometry utilities for the Roman SNPIT
 Author: Roman Supernove Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>

roman_snpit_snappl-0.8.0/changes/41.snappl.rst

@@ -0,0 +1 @@
+Made OU24 PSFs have passable WCSs

roman_snpit_snappl-0.8.0/changes/43.snappl.rst

@@ -0,0 +1 @@
+Update tests to use photometry_test_data, small edit to config file layout.

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0/roman_snpit_snappl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.7.0
+Version: 0.8.0
 Summary: Photometry utilities for the Roman SNPIT
 Author: Roman Supernove Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/roman_snpit_snappl.egg-info/SOURCES.txt

@@ -39,6 +39,8 @@ changes/35.snappl.rst
 changes/36.snappl.rst
 changes/37.snappl.rst
 changes/40.snappl.rst
+changes/41.snappl.rst
+changes/43.snappl.rst
 changes/5.snappl.rst
 changes/8.snappl.rst
 changes/9.snappl.rst

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/snappl/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.7.0'
-__version_tuple__ = version_tuple = (0, 7, 0)
+__version__ = version = '0.8.0'
+__version_tuple__ = version_tuple = (0, 8, 0)
+
+__commit_id__ = commit_id = 'gfdb162af4'

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/snappl/image.py

@@ -458,7 +458,7 @@ class FITSImage( Numpy2DImage ):
                               f"pixel, you tried to pass a size of {xsize, ysize}.")
 
         SNLogger.debug(f'Cutting out at {x , y}')
-        data, noise, flags = self.get_data( 'all', always_reload=False )
+        data, noise, flags = self.get_data( 'all' )
 
         wcs = self.get_wcs()
         if ( wcs is not None ) and ( not isinstance( wcs, AstropyWCS ) ):
@@ -613,4 +613,3 @@ class ManualFITSImage(FITSImage):
         if self._header is None:
             raise RuntimeError("Header is not set for ManualFITSImage.")
         return self._header
-

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/snappl/psf.py

@@ -13,6 +13,7 @@ import galsim
 from roman_imsim.utils import roman_utils
 
 # roman snpit library imports
+from snappl.wcs import BaseWCS
 from snpit_utils.config import Config
 from snpit_utils.logger import SNLogger
 
@@ -1051,7 +1052,7 @@ class ou24PSF_slow( PSF ):
             self.sed = sed
 
         if config_file is None:
-            config_file = Config.get().value( 'ou24psf.config_file' )
+            config_file = Config.get().value( 'ou24.config_file' )
         self.config_file = config_file
         self.pointing = pointing
         self.sca = sca
@@ -1067,13 +1068,17 @@ class ou24PSF_slow( PSF ):
         return self.size
 
 
-    def get_stamp( self, x=None, y=None, x0=None, y0=None, flux=1., seed=None ):
+    def get_stamp( self, x=None, y=None, x0=None, y0=None, flux=1., seed=None, input_wcs=None):
         """Return a 2d numpy image of the PSF at the image resolution.
 
         Parameters are as in PSF.get_stamp, plus:
 
         Parameters
         ----------
+          input_wcs : BaseWCS or galsim.BaseWCS
+            WARNING: DO NOT USE. Not part of a standard interface, for testing purposes only.
+            An alternative WCS to use for the stamp.
+
           seed : int
             A random seed to pass to galsim.BaseDeviate for photonOps.
             NOTE: this is not part of the base PSF interface (at least,
@@ -1112,8 +1117,20 @@ class ou24PSF_slow( PSF ):
             # It seems that galsim.ChromaticObject.drawImage won't function without stamp having
             # a wcs.  Without a WCS, the stamp was coming out all zeros.
             # TODO : does rmutils.getLocalWCS want 1-indexed or 0-indexed coordinates???
-            wcs = rmutils.getLocalWCS( x+1, y+1 )
-            stamp = galsim.Image( self.stamp_size, self.stamp_size, wcs=wcs )
+            # wcs = rmutils.getLocalWCS( x+1, y+1 )self._
+
+            if input_wcs is None:
+                self._wcs = rmutils.getLocalWCS( x+1, y+1 )
+            elif isinstance(input_wcs, BaseWCS):
+                SNLogger.debug( "Using user-supplied wcs for ou24PSF." )
+                self._wcs = input_wcs.get_galsim_wcs().local( image_pos = galsim.PositionD(x+1, y+1 ))
+            elif isinstance( input_wcs, galsim.BaseWCS ):
+                SNLogger.debug( "Using user-supplied wcs for ou24PSF." )
+                self._wcs = input_wcs.local( image_pos = galsim.PositionD(x+1, y+1 ))
+            else:
+                raise TypeError( f"wcs must be a galsim.BaseWCS, not a {type(input_wcs)}" )
+
+            stamp = galsim.Image( self.stamp_size, self.stamp_size, wcs=self._wcs )
             point = ( galsim.DeltaFunction() * self.sed ).withFlux( flux, rmutils.bpass )
             # TODO : make sure that rmutils.getPSF wants 1-indexed positions (which we assume here).
             # (This is not that big a deal, because the PSF is not going to vary significantly
@@ -1130,14 +1147,14 @@ class ou24PSF_slow( PSF ):
             #  if that's the correct word) that describes where the photons
             # should be shot, with some randomness.
             if self.include_photonOps:
-                point.drawImage( rmutils.bpass, method='phot', rng=rmutils.rng, photon_ops=photon_ops,
-                              n_photons=self.n_photons, maxN=self.n_photons, poisson_flux=False,
-                              center=center, use_true_center=True, image=stamp )
+                point.drawImage(rmutils.bpass, method='phot', rng=rmutils.rng, photon_ops=photon_ops,
+                                n_photons=self.n_photons, maxN=self.n_photons, poisson_flux=False,
+                                center=center, use_true_center=True, image=stamp)
 
             else:
                 psf = galsim.Convolve(point, photon_ops[0])
                 psf.drawImage(rmutils.bpass, method="no_pixel", center=center,
-                              use_true_center=True, image=stamp, wcs=wcs)
+                              use_true_center=True, image=stamp, wcs=self._wcs)
 
             self._stamps[(x, y, stampx, stampy)] = stamp.array
 
@@ -1150,15 +1167,21 @@ class ou24PSF( ou24PSF_slow ):
         super().__init__(*args, **kwargs)
         self._psf = None
 
-    def _init_psf_object( self, x0=None, y0=None, flux=1.):
+    def _init_psf_object( self, x0=None, y0=None, flux=1., input_wcs = None):
         """Create the galsim PSF object, WCS, and galsim.chromatic.SimpleChromaticTransformation
            that can be reused for multiple calls to get_stamp.
 
+        WARNING: Do not use input_wcs. Not part of a standard interface, for testing & simulation purposes only.
+
+
         Parameters are as in PSF.get_stamp, plus:
 
         Parameters
         ----------
-          seed : int
+        input_wcs : BaseWCS or galsim.BaseWCS
+            An alternative WCS to use for the stamp.
+
+        seed : int
             A random seed to pass to galsim.BaseDeviate for photonOps.
             NOTE: this is not part of the base PSF interface (at least,
             as of yet), so don't use it in production pipeline code.
@@ -1170,7 +1193,18 @@ class ou24PSF( ou24PSF_slow ):
         self._rmutils = roman_utils(self.config_file, self.pointing, self.sca)
         self._psf = self._rmutils.getPSF(x0+1, y0+1, pupil_bin=8)
         # TODO : does rmutils.getLocalWCS want 1-indexed or 0-indexed coordinates???
-        self._wcs = self._rmutils.getLocalWCS( x0+1, y0+1 )
+        if input_wcs is None:
+            self._wcs = self._rmutils.getLocalWCS( x0+1, y0+1 )
+        elif isinstance(input_wcs, BaseWCS):
+            SNLogger.debug( "Using user-supplied wcs for ou24PSF." )
+            self._wcs = input_wcs.get_galsim_wcs().local( image_pos = galsim.PositionD(x0+1, y0+1))
+        elif isinstance( input_wcs, galsim.BaseWCS):
+            SNLogger.debug( "Using user-supplied wcs for ou24PSF." )
+            self._wcs = input_wcs.local( image_pos=galsim.PositionD(x0+1, y0+1))
+        else:
+            raise TypeError( f"wcs must be a galsim.BaseWCS, not a {type(input_wcs)}" )
+        SNLogger.debug( f"ou24PSF wcs fetched at: {x0, y0}" )
+        SNLogger.debug( f"ou24PSF wcs: {self._wcs}" )
         self._stamp = galsim.Image( self.stamp_size, self.stamp_size, wcs=self._wcs )
         self._point = ( galsim.DeltaFunction() * self.sed ).withFlux( flux, self._rmutils.bpass )
         self._convolved_psf = galsim.Convolve(self._point, self._psf)
@@ -1178,12 +1212,16 @@ class ou24PSF( ou24PSF_slow ):
         self._stored_x0 = x0
         self._stored_y0 = y0
 
-    def get_stamp(self, x=None, y=None, x0=None, y0=None, flux=1.0, seed=None):
+    def get_stamp(self, x=None, y=None, x0=None, y0=None, flux=1.0, seed=None, input_wcs=None):
         """Return a 2d numpy image of the PSF at the image resolution.
         Parameters are as in PSF.get_stamp, plus:
 
         Parameters
         ----------
+        wcs : BaseWCS or galsim.BaseWCS
+            WARNING: DO NOT USE. Not part of a standard interface, for testing purposes only.
+            An alternative WCS to use for the stamp.
+
           seed : int
             A random seed to pass to galsim.BaseDeviate for photonOps.
             NOTE: this is not part of the base PSF interface (at least,
@@ -1197,7 +1235,6 @@ class ou24PSF( ou24PSF_slow ):
         #   (within 1/2 pixel; by default, we want to make x and y
         #   centered on a pixel).
 
-
         x = x if x is not None else float( self.sca_size // 2 )
         y = y if y is not None else float( self.sca_size // 2 )
 
@@ -1213,7 +1250,7 @@ class ou24PSF( ou24PSF_slow ):
             SNLogger.debug( "Initializing ou24PSF galsim PSF object." )
             # If we don't have a psf object, then we need to initialize it, we then re use it for multiple calls to
             # get_stamp.
-            self._init_psf_object( x0=x0, y0=y0, flux=flux)
+            self._init_psf_object( x0=x0, y0=y0, flux=flux, input_wcs = input_wcs)
         else:
             if x0 != self._stored_x0 or y0 != self._stored_y0:
                 raise ValueError("ou24PSF.get_stamp called with x0 or y0 that does not match the x0 or y0 used"

{roman_snpit_snappl-0.7.0 → roman_snpit_snappl-0.8.0}/snappl/sed.py

@@ -28,6 +28,7 @@ class Flat_SED( SED_collection ):
     def get_sed( self, **kwargs):
         return self.sed
 
+
 class Single_CSV_SED( SED_collection ):
     def __init__( self, csv_file ):
         # READ THE CSV FILE, make a galsim SED in self.sed