Merge pull request #159 from karllark/add_wfc3

Add WFC3 grism mocking for models

Author: karllark

measure_extinction/merge_obsspec.py

@@ -3,18 +3,28 @@
 import astropy.units as u
 
 __all__ = [
+    "merge_gen_obsspec",
     "merge_iue_obsspec",
     "merge_stis_obsspec",
     "merge_spex_obsspec",
-    "merge_nircam_ss_obsspec",
-    "merge_irs_obsspec",
-    "merge_miri_lrs_obsspec",
-    "merge_miri_ifu_obsspec",
 ]
 
 fluxunit = u.erg / (u.s * u.cm * u.cm * u.angstrom)
 
 
+# define the basic info for each type of spectra
+#   info for each entry is (resolution, wavelength_range)
+obsspecinfo = {
+    "wfc3_g102": (210, [0.8, 1.15] * u.micron),
+    "wfc3_g141": (130, [1.075, 1.70] * u.micron),
+    "niriss_soss": (700, [0.85, 2.75] * u.micron),
+    "nircam_ss": (1600, [2.35, 5.55] * u.micron),
+    "irs": (150, [5.0, 40.0] * u.micron),
+    "miri_lrs": (160, [5.0, 13.0] * u.micron),
+    "miri_ifu": (3000, [4.8, 29.0] * u.micron),
+}
+
+
 def _wavegrid(resolution, wave_range):
     """
     Define a wavelength grid at a specified resolution given
@@ -307,142 +317,8 @@ def merge_iue_obsspec(obstables, output_resolution=1000):
     wave_range = [1000.0, 3400.0] * u.angstrom
 
     otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution,
+        obstables,
+        wave_range,
+        output_resolution=output_resolution,
     )
     return otable
-
-
-def merge_irs_obsspec(obstables, output_resolution=150):
-    """
-    Merge one or more Spitzer IRS 1D spectra into a single spectrum
-    on a uniform wavelength scale
-
-    Parameters
-    ----------
-    obstables : list of astropy Table objects
-        list of tables containing the observed IRS spectra
-        usually the result of reading tables
-
-    output_resolution : float
-        output resolution of spectra
-        input spectrum assumed to be at the observed resolution
-
-    Returns
-    -------
-    output_table : astropy Table object
-        merged spectrum
-    """
-    wave_range = [5.0, 40.0] * u.micron
-    otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution,
-    )
-    return otable
-
-
-def merge_niriss_soss_obsspec(obstables, output_resolution=700):
-    """
-    Merge one or more NIRCam slitless 1D spectra into a single spectrum
-    on a uniform wavelength scale
-
-    Parameters
-    ----------
-    obstables : list of astropy Table objects
-        list of tables containing the observed IRS spectra
-        usually the result of reading tables
-
-    output_resolution : float
-        output resolution of spectra
-        input spectrum assumed to be at the observed resolution
-
-    Returns
-    -------
-    output_table : astropy Table object
-        merged spectrum
-    """
-    wave_range = [0.85, 2.75] * u.micron
-    otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution
-    )
-    return otable
-
-
-def merge_nircam_ss_obsspec(obstables, output_resolution=1600):
-    """
-    Merge one or more NIRCam slitless 1D spectra into a single spectrum
-    on a uniform wavelength scale
-
-    Parameters
-    ----------
-    obstables : list of astropy Table objects
-        list of tables containing the observed IRS spectra
-        usually the result of reading tables
-
-    output_resolution : float
-        output resolution of spectra
-        input spectrum assumed to be at the observed resolution
-
-    Returns
-    -------
-    output_table : astropy Table object
-        merged spectrum
-    """
-    wave_range = [2.35, 5.55] * u.micron
-    otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution
-    )
-    return otable
-
-
-def merge_miri_lrs_obsspec(obstables, output_resolution=160):
-    """
-    Merge one or more MIRI LRS spectra into a single spectrum
-    on a uniform wavelength scale
-
-    Parameters
-    ----------
-    obstables : list of astropy Table objects
-        list of tables containing the observed IRS spectra
-        usually the result of reading tables
-
-    output_resolution : float
-        output resolution of spectra
-        input spectrum assumed to be at the observed resolution
-
-    Returns
-    -------
-    output_table : astropy Table object
-        merged spectrum
-    """
-    wave_range = [5.0, 13.0] * u.micron
-    otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution,
-    )
-    return otable
-
-
-def merge_miri_ifu_obsspec(obstables, output_resolution=3000):
-    """
-    Merge one or more MIRI IFU 1D spectra into a single spectrum
-    on a uniform wavelength scale
-
-    Parameters
-    ----------
-    obstables : list of astropy Table objects
-        list of tables containing the observed IRS spectra
-        usually the result of reading tables
-
-    output_resolution : float
-        output resolution of spectra
-        input spectrum assumed to be at the observed resolution
-
-    Returns
-    -------
-    output_table : astropy Table object
-        merged spectrum
-    """
-    wave_range = [4.8, 29.0] * u.micron
-    otable = merge_gen_obsspec(
-        obstables, wave_range, output_resolution=output_resolution,
-    )
-
-    return otable

measure_extinction/tests/test_merge_obsspec.py

@@ -6,18 +6,14 @@
     fluxunit,
     _wavegrid,
     merge_iue_obsspec,
-    merge_irs_obsspec,
-    merge_niriss_soss_obsspec,
-    merge_nircam_ss_obsspec,
-    merge_miri_lrs_obsspec,
-    merge_miri_ifu_obsspec,
+    merge_gen_obsspec,
 )
 
 # still need to add merging of STIS spectroscopy
 #  more complicated due to UV/optical options
 
 
-def _check_genmerge(wave_range, resolution, mergefunc):
+def _check_genmerge(wave_range, resolution, mergefunc, iue=False):
 
     wave1_info = _wavegrid(resolution, wave_range.value)
     wave1 = wave1_info[0] * wave_range.unit
@@ -37,7 +33,10 @@ def _check_genmerge(wave_range, resolution, mergefunc):
     itable2["NPTS"] = np.full(nwaves, 1)
 
     # merge into standard format
-    otable = mergefunc([itable1, itable2])
+    if iue:
+        otable = mergefunc([itable1, itable2])
+    else:
+        otable = mergefunc([itable1, itable2], wave_range, resolution)
 
     # check standard format
     for ckey in ["WAVELENGTH", "FLUX", "SIGMA", "NPTS"]:
@@ -50,34 +49,11 @@ def _check_genmerge(wave_range, resolution, mergefunc):
 def test_iue():
     wave_range = [1000.0, 3400.0] * u.angstrom
     resolution = 1000.0
-    _check_genmerge(wave_range, resolution, merge_iue_obsspec)
+    _check_genmerge(wave_range, resolution, merge_iue_obsspec, iue=True)
 
 
+# only need to test one of the "generic" merges as all the rest work the same
 def test_irs():
     wave_range = [5.0, 40.0] * u.micron
     resolution = 150.0
-    _check_genmerge(wave_range, resolution, merge_irs_obsspec)
-
-
-def test_niriss_soss():
-    wave_range = [0.85, 2.75] * u.micron
-    resolution = 700.0
-    _check_genmerge(wave_range, resolution, merge_niriss_soss_obsspec)
-
-
-def test_nircam_ss():
-    wave_range = [2.35, 5.55] * u.micron
-    resolution = 1600.0
-    _check_genmerge(wave_range, resolution, merge_nircam_ss_obsspec)
-
-
-def test_miri_lrs():
-    wave_range = [4.0, 15.0] * u.micron
-    resolution = 160.0
-    _check_genmerge(wave_range, resolution, merge_miri_lrs_obsspec)
-
-
-def test_miri_mrs():
-    wave_range = [4.5, 32.0] * u.micron
-    resolution = 4000.0
-    _check_genmerge(wave_range, resolution, merge_miri_ifu_obsspec)
+    _check_genmerge(wave_range, resolution, merge_gen_obsspec)