roman-snpit-snappl 0.13.0__tar.gz → 0.15.0__tar.gz

{roman_snpit_snappl-0.13.0/roman_snpit_snappl.egg-info → roman_snpit_snappl-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.13.0
+Version: 0.15.0
 Summary: Photometry utilities for the Roman SNPIT
 Author: Roman Supernova Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>
@@ -10,18 +10,18 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: astropy
-Requires-Dist: photutils
-Requires-Dist: pandas
-Requires-Dist: h5py
-Requires-Dist: roman-datamodels
-Requires-Dist: snpit_utils
-Requires-Dist: towncrier
-Requires-Dist: setuptools_scm
-Requires-Dist: cruft
-Requires-Dist: coverage
+Requires-Dist: astropy<8.0.0,>=7.1.0
+Requires-Dist: fitsio<2.0.0,>=1.2.5
+Requires-Dist: galsim<3.0.0,>=2.7.2
+Requires-Dist: gwcs<0.27.0,>=0.26.0
+Requires-Dist: h5py<4.0.0,>=3.14.0
+Requires-Dist: numpy<3.0.0,>=2.2.6
+Requires-Dist: pandas<3.0.0,>=2.3.3
+Requires-Dist: photutils<3.0.0,>=2.3.0
+Requires-Dist: pyyaml<7.0.0,>=6.0.3
+Requires-Dist: roman-datamodels<0.28.0,>=0.27.0
+Requires-Dist: scipy<2.0.0,>=1.16.2
+Requires-Dist: snpit_utils<0.1.0,>=0.0.12
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-doctestplus; extra == "test"

roman_snpit_snappl-0.15.0/changes/74.bugfix.rst

@@ -0,0 +1 @@
+Fix an issue in ImageSimulator where pointsources were all 2× too bright.

roman_snpit_snappl-0.15.0/changes/79.snappl.rst

@@ -0,0 +1 @@
+Make the URL of the roman-desc-simdex configurable

roman_snpit_snappl-0.15.0/changes/82.snappl.rst

@@ -0,0 +1 @@
+Playing with dependencies

roman_snpit_snappl-0.15.0/experimentation/ap_phot_simulated_images.py

@@ -0,0 +1,68 @@
+import argparse
+from matplotlib import pyplot
+
+import numpy as np
+import photutils.aperture
+
+from snappl.image import FITSImageStdHeaders
+
+parser = argparse.ArgumentParser( 'ap_phot_ismulated_images.py' )
+parser.add_argument( '-i', '--image-basenames', nargs='+', required=True,
+                     help="Image basenames.  Leave off _image.fits" )
+parser.add_argument( '-r', '--ra', type=float, required=True, help="Transient RA" )
+parser.add_argument( '-d', '--dec', type=float, required=True, help="Transient Dec" )
+parser.add_argument( '--rad', type=float, default=5.0, help="Aperture radius in pixels (default 5)" )
+parser.add_argument( '--transient-peak-mag', '--tp', type=float, default=21.,
+                     help="Peak magnitude of transient (default: 21)" )
+parser.add_argument( '--transient-start-mjd', '--tt0', type=float, default=60010.,
+                     help="Start MJD of transient linear rise (default: 60010.)" )
+parser.add_argument( '--transient-peak-mjd', '--ttm', type=float, default=60030.,
+                     help="Peak MJD of transient (default: 60030.)" )
+parser.add_argument( '--transient-end-mjd', '--tt1', type=float, default=60060.,
+                     help="End MJD of transient linear decay (default: 60060.)" )
+parser.add_argument( '-s', '--save-plot', default=None,
+                     help="Save plot to this file" )
+args = parser.parse_args()
+
+
+images = [ FITSImageStdHeaders(p, std_imagenames=True) for p in args.image_basenames ]
+mjds = np.array( [ i.mjd for i in images ] )
+
+fluxen = []
+apflux = []
+apfluxerr = []
+for image in images:
+    data = image.get_data( which='data' )[0]
+    noise = image.get_data( which='noise' )[0]
+    peakflux = 10 ** ( ( args.transient_peak_mag - image.zeropoint ) / -2.5 )
+    flux = 0.
+    if ( image.mjd >= args.transient_start_mjd ) and ( image.mjd <= args.transient_end_mjd ):
+        mjdedge = ( args.transient_start_mjd if image.mjd < args.transient_peak_mjd
+                    else args.transient_end_mjd )
+        flux = peakflux * ( image.mjd - mjdedge ) / ( args.transient_peak_mjd - mjdedge )
+    fluxen.append( flux )
+
+    wcs = image.get_wcs()
+    x, y = wcs.world_to_pixel( args.ra, args.dec )
+    aperture = photutils.aperture.CircularAperture( (x, y), args.rad )
+    res = photutils.aperture.aperture_photometry( data, aperture, error=noise )
+    apflux.append( res['aperture_sum'][0] )
+    apfluxerr.append( res['aperture_sum_err'][0] )
+
+fluxen = np.array( fluxen )
+apflux = np.array( apflux )
+apfluxerr = np.array( apfluxerr )
+
+fig, ax = pyplot.subplots()
+fig.set_tight_layout( True )
+ax.errorbar( mjds, apflux - fluxen, apfluxerr, linestyle='none', marker='s', color='red',
+             label=f'{args.rad}-pix radius aperture' )
+xmin, xmax = ax.get_xlim()
+ax.hlines( 0, xmin, xmax, linestyle='dotted', color='black' )
+ax.set_label( "MJD" )
+ax.set_ylabel( "Apphot flux - true flux (counts)" )
+ax.legend()
+fig.show()
+if args.save_plot is not None:
+    fig.savefig( args.save_plot )
+pyplot.show()

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/pyproject.toml

@@ -17,19 +17,18 @@ classifiers = [
   "Programming Language :: Python"
 ]
 dependencies = [
-  "numpy",
-  "scipy",
-  "astropy",
-  "photutils",
-  "pandas",
-  "h5py",
-  "roman-datamodels",
-  "snpit_utils",
-  "towncrier",
-  "setuptools_scm",
-  "cruft",
-  "coverage",
-  
+  "astropy>=7.1.0,<8.0.0",
+  "fitsio>=1.2.5,<2.0.0",
+  "galsim>=2.7.2,<3.0.0",
+  "gwcs>=0.26.0,<0.27.0",
+  "h5py>=3.14.0,<4.0.0",
+  "numpy>=2.2.6,<3.0.0",
+  "pandas>=2.3.3,<3.0.0",
+  "photutils>=2.3.0,<3.0.0",
+  "pyyaml>=6.0.3,<7.0.0",
+  "roman-datamodels>=0.27.0,<0.28.0",
+  "scipy>=1.16.2,<2.0.0",
+  "snpit_utils>=0.0.12,<0.1.0"
 ]
 license-files = ["LICENSE"]
 
@@ -69,6 +68,9 @@ repository = "https://github.com/Roman-Supernova-PIT"
 
 [build-system]
 requires = [
+  "towncrier",
+  "cruft",
+  "coverage",
   "setuptools>=62.1",
   "setuptools_scm[tomli]>=6.2",
   "wheel",

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0/roman_snpit_snappl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.13.0
+Version: 0.15.0
 Summary: Photometry utilities for the Roman SNPIT
 Author: Roman Supernova Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>
@@ -10,18 +10,18 @@ Classifier: Programming Language :: Python
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: astropy
-Requires-Dist: photutils
-Requires-Dist: pandas
-Requires-Dist: h5py
-Requires-Dist: roman-datamodels
-Requires-Dist: snpit_utils
-Requires-Dist: towncrier
-Requires-Dist: setuptools_scm
-Requires-Dist: cruft
-Requires-Dist: coverage
+Requires-Dist: astropy<8.0.0,>=7.1.0
+Requires-Dist: fitsio<2.0.0,>=1.2.5
+Requires-Dist: galsim<3.0.0,>=2.7.2
+Requires-Dist: gwcs<0.27.0,>=0.26.0
+Requires-Dist: h5py<4.0.0,>=3.14.0
+Requires-Dist: numpy<3.0.0,>=2.2.6
+Requires-Dist: pandas<3.0.0,>=2.3.3
+Requires-Dist: photutils<3.0.0,>=2.3.0
+Requires-Dist: pyyaml<7.0.0,>=6.0.3
+Requires-Dist: roman-datamodels<0.28.0,>=0.27.0
+Requires-Dist: scipy<2.0.0,>=1.16.2
+Requires-Dist: snpit_utils<0.1.0,>=0.0.12
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-doctestplus; extra == "test"

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/roman_snpit_snappl.egg-info/SOURCES.txt

@@ -55,7 +55,10 @@ changes/65.bugfix.rst
 changes/68.feature.rst
 changes/72.snappl.rst
 changes/73.feature.rst
+changes/74.bugfix.rst
+changes/79.snappl.rst
 changes/8.snappl.rst
+changes/82.snappl.rst
 changes/9.snappl.rst
 docs/Makefile
 docs/api.rst
@@ -67,6 +70,7 @@ docs/make.bat
 docs/usage.rst
 docs/_static/logo_black_filled.png
 experimentation/README.md
+experimentation/ap_phot_simulated_images.py
 experimentation/play_with_photutils.py
 licenses/.DS_Store
 licenses/LICENSE.rst

roman_snpit_snappl-0.15.0/roman_snpit_snappl.egg-info/requires.txt

@@ -0,0 +1,28 @@
+astropy<8.0.0,>=7.1.0
+fitsio<2.0.0,>=1.2.5
+galsim<3.0.0,>=2.7.2
+gwcs<0.27.0,>=0.26.0
+h5py<4.0.0,>=3.14.0
+numpy<3.0.0,>=2.2.6
+pandas<3.0.0,>=2.3.3
+photutils<3.0.0,>=2.3.0
+pyyaml<7.0.0,>=6.0.3
+roman-datamodels<0.28.0,>=0.27.0
+scipy<2.0.0,>=1.16.2
+snpit_utils<0.1.0,>=0.0.12
+
+[docs]
+sphinx
+sphinx-automodapi
+matplotlib
+mock
+tomli
+graphviz
+
+[test]
+pytest
+pytest-doctestplus
+pytest-cov
+requests
+tox
+devpi_process

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/snappl/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.13.0'
-__version_tuple__ = version_tuple = (0, 13, 0)
+__version__ = version = '0.15.0'
+__version_tuple__ = version_tuple = (0, 15, 0)
 
-__commit_id__ = commit_id = 'g57a44b882'
+__commit_id__ = commit_id = 'g719a5ba90'

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/snappl/diaobject.py

@@ -1,5 +1,6 @@
 __all__ = [ 'DiaObject', 'DiaObjectOU2024', 'DiaObjectManual' ]
 
+from snpit_utils.config import Config
 from snpit_utils.http import retry_post
 
 
@@ -53,7 +54,7 @@ class DiaObject:
         ----------
           collection : str
             Which collection of object to search.  Currently only
-            "ou2024" and "manuasl" are implemented, but others will be later.
+            "ou2024" and "manual" are implemented, but others will be later.
 
           subset : str
             Subset of collection to search.  Many collections (including
@@ -189,8 +190,8 @@ class DiaObjectOU2024( DiaObject ):
         if mjd_end_min is not None:
             params['mjd_end_max'] = float( mjd_end_max )
 
-
-        res = retry_post( 'https://roman-desc-simdex.lbl.gov/findtransients', json=params )
+        simdex = Config.get().value( 'photometry.snappl.simdex_server' )
+        res = retry_post( f'{simdex}/findtransients', json=params )
         objinfo = res.json()
 
         diaobjects = []

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/snappl/image.py

@@ -548,7 +548,7 @@ class Numpy2DImage( Image ):
     @property
     def data( self ):
         if self._data is None:
-            self._load_data()
+            self._load_data( which='data' )
         return self._data
 
     @data.setter
@@ -564,7 +564,7 @@ class Numpy2DImage( Image ):
     @property
     def noise( self ):
         if self._noise is None:
-            self._load_data()
+            self._load_data( which='noise' )
         return self._noise
 
     @noise.setter
@@ -580,7 +580,7 @@ class Numpy2DImage( Image ):
     @property
     def flags( self ):
         if self._flags is None:
-            self._load_data()
+            self._load_data( which='flags' )
         return self._flags
 
     @flags.setter
@@ -607,9 +607,9 @@ class Numpy2DImage( Image ):
             self._image_shape = self.data.shape
         return self._image_shape
 
-    def _load_data( self ):
+    def _load_data( self, which="all" ):
         """Loads (or reloads) the data from disk."""
-        self.get_data( which="all", cache=True, always_reload=False )
+        self.get_data( which=which, cache=True, always_reload=False )
 
     def free( self ):
         self._data = None

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/snappl/image_simulator.py

@@ -5,31 +5,14 @@ import multiprocessing
 
 import numpy as np
 import astropy.wcs
-import astropy.io.fits
 
 from snpit_utils.logger import SNLogger
+from snpit_utils.utils import isSequence
 from snappl.psf import PSF
 from snappl.image import FITSImageStdHeaders
 from snappl.wcs import AstropyWCS
 
 
-def _kwargs_list_to_kwargs( kwargs_list ):
-    unpack = re.compile( r"^([a-zA-Z0-9_]+)\s*=\s*(.*[^\s])\s*$" )
-    kwargs = {}
-    for arg in kwargs_list:
-        mat = unpack.search( arg )
-        if mat is None:
-            raise ValueError( f"Failed to parse key=val from '{arg}'" )
-        try:
-            kwargs[ mat.group(1) ] = int( mat.group(2) )
-        except ValueError:
-            try:
-                kwargs[ mat.group(1) ] = float( mat.group(2) )
-            except ValueError:
-                kwargs[ mat.group(1) ] = mat.group(2)
-    return kwargs
-
-
 class ImageSimulatorPointSource:
     def __init__( self, ra=None, dec=None, psf=None ):
         if any( i is None for i in [ ra, dec, psf ] ):
@@ -50,13 +33,13 @@ class ImageSimulatorPointSource:
         x0 = int( np.floor( x + 0.5 ) )
         y0 = int( np.floor( y + 0.5 ) )
         stamp = self.psf.get_stamp( x, y, x0=x0, y0=y0, flux=flux )
+        var = np.zeros( stamp.shape )
         if noisy:
             if rng is None:
                 rng = np.random.default_rng()
             w = stamp > 0
-            var = np.zeros( stamp.shape )
             var[ w ] = stamp[ w ] / gain
-            stamp[ w ] += rng.normal( stamp[w], np.sqrt( var[w] ) )
+            stamp[ w ] += rng.normal( 0., np.sqrt( var[w] ) )
 
         sx0 = 0
         sx1 = stamp.shape[1]
@@ -114,13 +97,10 @@ class ImageSimulationStar( ImageSimulatorPointSource ):
 
 
 class ImageSimulatorStarCollection:
-    def __init__( self, ra=None, dec=None, fieldrad=None, m0=None, m1=None, alpha=None, nstars=None,
-                  psf_class='gaussian', psf_kwargs=['sigmax=1.', 'sigmay=1.', 'theta=0.'],
-                  rng=None ):
+    def __init__( self, psf, ra=None, dec=None, fieldrad=None, m0=None, m1=None, alpha=None, nstars=None, rng=None ):
         if rng is None:
             self.rng = np.random.default_rng()
-        kwargs = _kwargs_list_to_kwargs( psf_kwargs )
-        self.psf = PSF.get_psf_object( psf_class, **kwargs )
+        self.psf = psf
 
         stars = []
         norm = ( alpha + 1 ) / ( m1 ** (alpha + 1) - m0 ** (alpha + 1) )
@@ -209,7 +189,7 @@ class ImageSimulatorImage:
         self.image.data += rng.normal( skymean, skysigma, size=self.image.data.shape )
         self.image.noise += np.full( self.image.noise.shape, skysigma**2 )
 
-    def add_stars( self, stars, rng=None, numprocs=12 ):
+    def add_stars( self, stars, rng=None, noisy=False, numprocs=12 ):
         if rng is None:
             rng = np.random.default_rng()
 
@@ -234,7 +214,7 @@ class ImageSimulatorImage:
                 x, y = self.image.get_wcs().world_to_pixel( star.ra, star.dec )
                 try:
                     data = star.render_star( self.image.data.shape[1], self.image.data.shape[0], x, y,
-                                             zeropoint=self.image.zeropoint, rng=rng )
+                                             zeropoint=self.image.zeropoint, rng=rng, noisy=noisy )
                     add_star_to_image( i, data )
                 except Exception as ex:
                     omg( ex )
@@ -244,7 +224,7 @@ class ImageSimulatorImage:
                     x, y = self.image.get_wcs().world_to_pixel( star.ra, star.dec )
                     doer = functools.partial( star.render_star,
                                               self.image.data.shape[1], self.image.data.shape[0], x, y,
-                                              zeropoint=self.image.zeropoint, rng=rng )
+                                              zeropoint=self.image.zeropoint, rng=rng, noisy=noisy )
                     callback = functools.partial( add_star_to_image, i )
                     pool.apply_async( doer, callback=callback, error_callback=omg )
                 pool.close()
@@ -254,7 +234,7 @@ class ImageSimulatorImage:
             raise RuntimeError( "Bad things have happened." )
 
 
-    def add_transient( self, transient, rng=None ):
+    def add_transient( self, transient, rng=None, noisy=False ):
         if rng is None:
             rng = np.random.default_rng()
 
@@ -263,7 +243,7 @@ class ImageSimulatorImage:
         ( stamp, var,
           imcoords, stampcoords ) = transient.render_transient( self.image.data.shape[1], self.image.data.shape[0],
                                                                 x, y, self.image.mjd, zeropoint=self.image.zeropoint,
-                                                                rng=rng )
+                                                                rng=rng, noisy=noisy )
         if stamp is not None:
             ix0, ix1, iy0, iy1 = imcoords
             sx0, sx1, sy0, sy1 = stampcoords
@@ -274,8 +254,7 @@ class ImageSimulatorImage:
 class ImageSimulator:
     def __init__( self,
                   seed=None,
-                  star_center_ra=None,
-                  star_center_dec=None,
+                  star_center=None,
                   star_sky_radius=320.,
                   min_star_magnitude=18.,
                   max_star_magnitude=28.,
@@ -283,6 +262,7 @@ class ImageSimulator:
                   nstars=200,
                   psf_class='gaussian',
                   psf_kwargs=[],
+                  no_star_noise=False,
                   basename='simimage',
                   width=4088,
                   height=4088,
@@ -302,13 +282,17 @@ class ImageSimulator:
                   transient_peak_mjd=60030.,
                   transient_start_mjd=60010.,
                   transient_end_mjd=60060.,
+                  no_transient_noise=False,
                   overwrite=False,
                   numprocs=12 ):
 
         self.mjds = mjds if mjds is not None else np.arange( 60000., 60065., 5. )
 
-        if ( star_center_ra is None ) or ( star_center_dec ) is None:
-            raise ValueError( "star_center_ra and star_center_dec are required" )
+        if star_center is None:
+            raise ValueError( "star_center and star_center is required" )
+        if ( not isSequence(star_center) ) or ( len(star_center) != 2 ):
+            raise ValueError( "star_center must have 2 values" )
+        star_center_ra, star_center_dec = star_center
 
         self.imdata = { 'mjds': mjds,
                         'ras': [],
@@ -357,6 +341,7 @@ class ImageSimulator:
         self.nstars = nstars
         self.psf_class = psf_class
         self.psf_kwargs = psf_kwargs
+        self.no_star_noise = no_star_noise
         self.band = band
         self.sca = sca
         self.exptime = exptime
@@ -366,6 +351,7 @@ class ImageSimulator:
         self.transient_peak_mjd = transient_peak_mjd
         self.transient_start_mjd = transient_start_mjd
         self.transient_end_mjd = transient_end_mjd
+        self.no_transient_noise = no_transient_noise
         self.overwrite = overwrite
         self.numprocs = numprocs
 
@@ -375,15 +361,28 @@ class ImageSimulator:
         star_rng = np.random.default_rng( base_rng.integers( 1, 2147483648 ) )
         transient_rng = np.random.default_rng( base_rng.integers( 1, 2147483648 ) )
 
-        stars = ImageSimulatorStarCollection( ra=self.star_center_ra, dec=self.star_center_dec,
+        unpack = re.compile( r"^([a-zA-Z0-9_]+)\s*=\s*(.*[^\s])\s*$" )
+        kwargs = {}
+        for arg in self.psf_kwargs:
+            mat = unpack.search( arg )
+            if mat is None:
+                raise ValueError( f"Failed to parse key=val from '{arg}'" )
+            try:
+                kwargs[ mat.group(1) ] = int( mat.group(2) )
+            except ValueError:
+                try:
+                    kwargs[ mat.group(1) ] = float( mat.group(2) )
+                except ValueError:
+                    kwargs[ mat.group(1) ] = mat.group(2)
+        psf = PSF.get_psf_object( self.psf_class, **kwargs )
+
+        stars = ImageSimulatorStarCollection( psf=psf, ra=self.star_center_ra, dec=self.star_center_dec,
                                               fieldrad=self.star_sky_radius,
                                               m0=self.min_star_magnitude, m1=self.max_star_magnitude,
-                                              alpha=self.alpha, nstars=self.nstars,
-                                              psf_class=self.psf_class, psf_kwargs=self.psf_kwargs,
-                                              rng=star_rng )
+                                              alpha=self.alpha, nstars=self.nstars, rng=star_rng )
 
         transient = ImageSimulatorTransient( ra=self.transient_ra, dec=self.transient_dec,
-                                             psf=stars.stars[0].psf, peak_mag=self.transient_peak_mag,
+                                             psf=psf, peak_mag=self.transient_peak_mag,
                                              peak_mjd=self.transient_peak_mjd, start_mjd=self.transient_start_mjd,
                                              end_mjd=self.transient_end_mjd )
 
@@ -395,8 +394,8 @@ class ImageSimulator:
                                           zeropoint=self.imdata['zps'][i], mjd=self.imdata['mjds'][i],
                                           pixscale=self.pixscale, band=self.band, sca=self.sca, exptime=self.exptime )
             image.render_sky( self.imdata['skys'][i], self.imdata['skyrmses'][i], rng=sky_rng )
-            image.add_stars( stars, star_rng, numprocs=self.numprocs )
-            image.add_transient( transient, rng=transient_rng )
+            image.add_stars( stars, star_rng, numprocs=self.numprocs, noisy=not self.no_star_noise )
+            image.add_transient( transient, rng=transient_rng, noisy=not self.no_transient_noise )
             image.image.noise = np.sqrt( image.image.noise )
             SNLogger.info( f"Writing {image.image.path}, {image.image.noisepath}, and {image.image.flagspath}" )
             image.image.save( overwrite=self.overwrite )
@@ -419,33 +418,35 @@ def main():
                          help="Maxinum (dimmest) magnitude star created (default 18)" )
     parser.add_argument( '-a', '--alpha', type=float, default=1.,
                          help="Power law exponent for star distribution (default: 1)" )
-    parser.add_argument( '-n', '--nstars', type=float, default=200,
+    parser.add_argument( '-n', '--nstars', type=int, default=200,
                          help="Generate this many stars (default 200)" )
     parser.add_argument( '-p', '--psf-class', default='gaussian',
                          help="psfclass to use for stars (default 'gaussian')" )
     parser.add_argument( '--psf-kwargs', '--pk', nargs='*', default=[],
                          help="Series of key=value PSF kwargs to pass to PSF.get_psf_object" )
+    parser.add_argument( '--no-star-noise', action='store_true', default=False,
+                         help="Set this to not add poisson noise to stars." )
 
     parser.add_argument( '-b', '--basename', default='simimage',
                          help=( "base for output filename.  Written files will be basename_{mjd:7.1f}_image.fits, "
                                 "..._noise.fits, and ..._flags.fits" ) )
-    parser.add_argument( '-w', '--width', type=int, default=4088, help="Image width (default: 4088)" )
-    parser.add_argument( '-h', '--height', type=int, default=4088, help="Image height (default: 4088)" )
+    parser.add_argument( '--width', type=int, default=4088, help="Image width (default: 4088)" )
+    parser.add_argument( '--height', type=int, default=4088, help="Image height (default: 4088)" )
     parser.add_argument( '--pixscale', '--ps', type=float, default=0.11,
                          help="Image pixel scale in arcsec/pixel (default 0.11)" )
     parser.add_argument( '-t', '--mjds', type=float, nargs='+', default=None,
                          help="MJDs of images (default: start at 60000., space by 5 days for 60 days)" )
     parser.add_argument( '--image-centers', '--ic', type=float, nargs='+', default=None,
                          help="ra0 dec0 ra1 dec1 ... ran decn centers of images" )
-    parser.add_argument( '-r', '--image-rotations', type=float, nargs='+', default=[0.],
+    parser.add_argument( '-θ', '--image-rotations', type=float, nargs='+', default=[0.],
                          help="Rotations (degrees) of images about centers" )
-    parser.add_argument( '-z', '--zerpoints', type=float, nargs='+', default=[33.],
+    parser.add_argument( '-z', '--zeropoints', type=float, nargs='+', default=[33.],
                          help="Image zeropoints (default: 33. for all)" )
     parser.add_argument( '-r', '--sky-noise-rms', type=float, nargs='+', default=100.,
                          help="Image sky RMS noise (default: 100. for all)" )
     parser.add_argument( '-s', '--sky-level', type=float, nargs='+', default=10.,
                          help="Image sky level (default: 10. for all)" )
-    parser.add_argument( '-b', '--band', default="R062",
+    parser.add_argument( '-f', '--band', '--filter', default="R062",
                          help="Stuck in the BAND Header in the images (default R062)." )
     parser.add_argument( '--sca', default=1,
                          help="Stuck in the SCA Header in the images (default 1)" )
@@ -462,8 +463,10 @@ def main():
                          help="Start MJD of transient linear rise (default: 60010.)" )
     parser.add_argument( '--transient-peak-mjd', '--ttm', type=float, default=60030.,
                          help="Peak MJD of transient (default: 60030.)" )
-    parser.add_argument( '--transient-end-mjd', '--tt1', type=float, default=60010.,
+    parser.add_argument( '--transient-end-mjd', '--tt1', type=float, default=60060.,
                          help="End MJD of transient linear decay (default: 60060.)" )
+    parser.add_argument( '--no-transient-noise', action='store_true', default=False,
+                         help="Set this to not add poisson noise to transients." )
 
     parser.add_argument( '--numprocs', type=int, default=12, help="Number of star rendering processes (default 12)" )
     parser.add_argument( '-o', '--overwrite', action='store_true', default=False,

{roman_snpit_snappl-0.13.0 → roman_snpit_snappl-0.15.0}/snappl/imagecollection.py

@@ -247,7 +247,8 @@ class ImageCollectionOU2024:
         if exptime_max is not None:
             params['exptime_max'] = float(exptime_max)
 
-        res = retry_post( "https://roman-desc-simdex.lbl.gov/findromanimages", json=params ).json()
+        simdex = Config.get().value( 'photometry.snappl.simdex_server' )
+        res = retry_post( f"{simdex}/findromanimages", json=params ).json()
 
         images = []
         for i in range( len(res['pointing']) ):

roman_snpit_snappl-0.13.0/roman_snpit_snappl.egg-info/requires.txt

@@ -1,28 +0,0 @@
-numpy
-scipy
-astropy
-photutils
-pandas
-h5py
-roman-datamodels
-snpit_utils
-towncrier
-setuptools_scm
-cruft
-coverage
-
-[docs]
-sphinx
-sphinx-automodapi
-matplotlib
-mock
-tomli
-graphviz
-
-[test]
-pytest
-pytest-doctestplus
-pytest-cov
-requests
-tox
-devpi_process