msaexp 0.7.2__tar.gz → 0.7.4__tar.gz

{msaexp-0.7.2 → msaexp-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: msaexp
-Version: 0.7.2
+Version: 0.7.4
 Summary: Manual extraction of JWST NIRSpec MSA spectra directly from the telescope exposures
 Home-page: https://github.com/gbrammer/msaexp
 Author: G. Brammer
@@ -84,3 +84,6 @@ Browsable table: https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_gra
 
 Full catalog: https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_graded_v0.ecsv
 
+Updated and additional extractions (2024-Feb): https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_graded_v2.html
+(Though see https://github.com/gbrammer/msaexp/pull/54)
+

{msaexp-0.7.2 → msaexp-0.7.4}/README.rst

@@ -49,3 +49,6 @@ Browsable table: https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_gra
 
 Full catalog: https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_graded_v0.ecsv
 
+Updated and additional extractions (2024-Feb): https://s3.amazonaws.com/msaexp-nirspec/extractions/nirspec_graded_v2.html
+(Though see https://github.com/gbrammer/msaexp/pull/54)
+

msaexp-0.7.4/msaexp/data/fwhm_data.py

@@ -0,0 +1,116 @@
+# Original WebbPSF
+# nspec = webbpsf.NIRSpec()
+# nspec.image_mask = 'S200A1' # 0.2 arcsec slit
+fwhm_data_orig = """# wave fwhm_pix
+0.6 1.04
+0.7 0.80
+0.8 0.67
+0.9 0.63
+1.0 0.62
+1.25 0.68
+1.5 0.79
+2.0 0.89
+2.5 0.95
+3.0 1.08
+4.0 1.41
+5.0 1.78
+5.5 1.94"""
+
+# nspec.image_mask = 'MSA all open'
+fwhm_data_update = """# wave fwhm_pix
+0.60  1.347
+0.65  1.119
+0.70  1.074
+0.75  0.935
+0.80  0.857
+0.85  0.807
+0.90  0.796
+0.95  0.775
+1.00  0.772
+1.08  0.823
+1.16  0.872
+1.25  0.907
+1.50  0.978
+1.75  1.056
+2.00  1.114
+2.25  1.111
+2.50  1.193
+2.75  1.199
+3.00  1.299
+3.50  1.430
+4.00  1.567
+4.50  1.885
+5.00  2.058
+5.25  2.271
+5.50  2.357"""
+
+# measured from a star from CAL-1493
+fwhm_data_2024 = """# wave fwhm_pix
+0.55 1.127
+0.58 1.127
+0.60 1.093
+0.63 1.075
+0.67 1.066
+0.71 1.063
+0.77 1.063
+0.83 1.067
+0.90 1.072
+0.99 1.079
+1.09 1.088
+1.21 1.097
+1.34 1.108
+1.47 1.118
+1.61 1.129
+1.75 1.140
+1.88 1.150
+2.01 1.160
+2.13 1.169
+2.25 1.178
+2.37 1.187
+2.48 1.196
+2.58 1.204
+2.68 1.213
+2.78 1.223
+2.88 1.233
+2.97 1.244
+3.06 1.256
+3.15 1.268
+3.24 1.281
+3.32 1.294
+3.40 1.308
+3.48 1.322
+3.56 1.336
+3.63 1.350
+3.71 1.365
+3.78 1.380
+3.85 1.395
+3.92 1.411
+3.99 1.427
+4.06 1.444
+4.13 1.463
+4.19 1.482
+4.26 1.503
+4.32 1.524
+4.38 1.546
+4.44 1.569
+4.51 1.592
+4.56 1.614
+4.62 1.635
+4.68 1.656
+4.74 1.676
+4.80 1.694
+4.85 1.713
+4.91 1.731
+4.96 1.752
+5.02 1.774
+5.07 1.799
+5.12 1.826
+5.17 1.851
+5.22 1.866
+5.28 1.859
+5.33 1.859
+5.38 1.859
+"""
+
+# Set default
+fwhm_data = fwhm_data_update

{msaexp-0.7.2 → msaexp-0.7.4}/msaexp/drizzle.py

@@ -641,8 +641,11 @@ def drizzle_slitlets(id, wildcard='*phot', files=None, output=None, verbose=True
         h['BUNIT'] = 'micron'
         hdul.append(pyfits.ImageHDU(data=waves, header=h))
         
+        # output_key = f'{output}-{id}-{gr}'
+        output_key = f'{output}_{gr}_{id}' # match spec.fits
+        
         if output is not None:
-            hdul.writeto(f'{output}-{id}-{gr}.d2d.fits', overwrite=True,
+            hdul.writeto(f'{output_key}.d2d.fits', overwrite=True,
                          output_verify='fix')
         
         if imshow_kws['vmax'] is None:
@@ -658,7 +661,7 @@ def drizzle_slitlets(id, wildcard='*phot', files=None, output=None, verbose=True
         if (show_drizzled):
             dfig = show_drizzled_product(hdul, imshow_kws=imshow_kws)
             if output is not None:
-                dfig.savefig(f'{output}-{id}-{gr}.d2d.png')
+                dfig.savefig(f'{output_key}.d2d.png')
         else:
             dfig = None
 
@@ -667,7 +670,7 @@ def drizzle_slitlets(id, wildcard='*phot', files=None, output=None, verbose=True
                                        imshow_kws=imshow_kws,
                                        with_background=(show_slits > 1))
             if output is not None:
-                sfig.savefig(f'{output}-{id}-{gr}.slit2d.png')
+                sfig.savefig(f'{output_key}.slit2d.png')
         else:
             sfig = None
         

{msaexp-0.7.2 → msaexp-0.7.4}/msaexp/pipeline.py

@@ -39,7 +39,7 @@ DETECTORS = ['nrs1','nrs2']
 __all__ = ["query_program", "exposure_groups", "NirspecPipeline"]
 
 
-def query_program(prog=2767, download=True, detectors=DETECTORS, gratings=GRATINGS, filters=FILTERS, extensions=['s2d'], product='rate', extra_filters=[]):
+def query_program(prog=2767, download=True, detectors=DETECTORS, gratings=GRATINGS, filters=FILTERS, extensions=['s2d'], product='rate', extra_filters=[], levels=['2','2a','2b']):
     """
     Query and download MSA exposures for a given program from MAST
     
@@ -72,6 +72,9 @@ def query_program(prog=2767, download=True, detectors=DETECTORS, gratings=GRATIN
     extra_filters : list
         Additional query filters from, e.g., `mastquery.jwst.make_query_filter`
     
+    levels : list
+        List of ``productLevel`` entries to include in the query
+    
     Returns
     -------
     res : `~astropy.table.Table`
@@ -83,7 +86,7 @@ def query_program(prog=2767, download=True, detectors=DETECTORS, gratings=GRATIN
     
     query = []
     query += mastquery.jwst.make_query_filter('productLevel', 
-                                                values=['2','2a','2b'])
+                                                values=levels)
     query += mastquery.jwst.make_program_filter([prog])
     
     if detectors is not None: