diff --git a/CHANGES.rst b/CHANGES.rst index 3e0b712a24..d0e278fc7b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,6 @@ -1.12.1dev ---------- +1.12.1 (21 Feb 2023) +-------------------- - (Hotfix) Specify sphinx versions to correctly work with sphinx_rtd_theme diff --git a/doc/help/pypeit_cache_github_data.rst b/doc/help/pypeit_cache_github_data.rst index d7a0ece9ad..2edc890ebc 100644 --- a/doc/help/pypeit_cache_github_data.rst +++ b/doc/help/pypeit_cache_github_data.rst @@ -10,19 +10,20 @@ spectrograph A valid spectrograph identifier: bok_bc, gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, - gemini_gmos_south_ham, gemini_gnirs, gtc_osiris, jwst_nircam, - jwst_nirspec, keck_deimos, keck_hires, keck_kcwi, - keck_lris_blue, keck_lris_blue_orig, keck_lris_red, - keck_lris_red_mark4, keck_lris_red_orig, keck_mosfire, - keck_nires, keck_nirspec_low, lbt_luci1, lbt_luci2, - lbt_mods1b, lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, + gemini_gmos_south_ham, gemini_gnirs, gtc_maat, gtc_osiris, + gtc_osiris_plus, jwst_nircam, jwst_nirspec, keck_deimos, + keck_hires, keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, lbt_mods2r, + ldt_deveny, magellan_fire, magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, p200_dbsp_red, p200_tspec, shane_kast_blue, shane_kast_red, - shane_kast_red_ret, soar_goodman_red, tng_dolores, vlt_fors2, - vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, - vlt_xshooter_vis, wht_isis_blue, wht_isis_red + shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, + tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, + vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, + wht_isis_red optional arguments: -h, --help show this help message and exit diff --git a/doc/help/pypeit_chk_for_calibs.rst b/doc/help/pypeit_chk_for_calibs.rst index 0a49637887..c48c189260 100644 --- a/doc/help/pypeit_chk_for_calibs.rst +++ b/doc/help/pypeit_chk_for_calibs.rst @@ -17,17 +17,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red (default: None) diff --git a/doc/help/pypeit_collate_1d.rst b/doc/help/pypeit_collate_1d.rst index 6406f8963e..b837654ee1 100644 --- a/doc/help/pypeit_collate_1d.rst +++ b/doc/help/pypeit_collate_1d.rst @@ -5,7 +5,7 @@ [--par_outfile PAR_OUTFILE] [--outdir OUTDIR] [--spec1d_outdir SPEC1D_OUTDIR] [--tolerance TOLERANCE] [--match_using MATCH_USING] [--dry_run] [--ignore_flux] - [--flux] [--exclude_slit_bm [EXCLUDE_SLIT_BM ...]] + [--flux] [--exclude_slit_bm EXCLUDE_SLIT_BM] [--exclude_serendip] [--wv_rms_thresh WV_RMS_THRESH] [--refframe {observed,heliocentric,barycentric}] [-v VERBOSITY] @@ -75,9 +75,9 @@ are coadded if all spec1ds have been fluxed calibrated. --flux If set, the script will flux calibrate using archived sensfuncs before coadding. - --exclude_slit_bm [EXCLUDE_SLIT_BM ...] + --exclude_slit_bm EXCLUDE_SLIT_BM A list of slit trace bitmask bits that should be - excluded. + excluded. Comma separated. --exclude_serendip Whether to exclude SERENDIP objects from collating. --wv_rms_thresh WV_RMS_THRESH If set, any objects with a wavelength RMS > this value diff --git a/doc/help/pypeit_obslog.rst b/doc/help/pypeit_obslog.rst index 5866ee3fa0..1a9f532ff3 100644 --- a/doc/help/pypeit_obslog.rst +++ b/doc/help/pypeit_obslog.rst @@ -14,17 +14,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red diff --git a/doc/help/pypeit_ql.rst b/doc/help/pypeit_ql.rst index 8f15685faf..6aeeca2fc6 100644 --- a/doc/help/pypeit_ql.rst +++ b/doc/help/pypeit_ql.rst @@ -18,17 +18,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red diff --git a/doc/help/pypeit_ql_multislit.rst b/doc/help/pypeit_ql_multislit.rst index b2d25b1643..c1f3b2f3cc 100644 --- a/doc/help/pypeit_ql_multislit.rst +++ b/doc/help/pypeit_ql_multislit.rst @@ -16,17 +16,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red diff --git a/doc/help/pypeit_setup.rst b/doc/help/pypeit_setup.rst index 374561e682..2f444d61d5 100644 --- a/doc/help/pypeit_setup.rst +++ b/doc/help/pypeit_setup.rst @@ -15,17 +15,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red (default: None) diff --git a/doc/help/pypeit_trace_edges.rst b/doc/help/pypeit_trace_edges.rst index bf68e3c9bd..7f76eb053e 100644 --- a/doc/help/pypeit_trace_edges.rst +++ b/doc/help/pypeit_trace_edges.rst @@ -29,19 +29,20 @@ providing files directly: bok_bc, gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, - gemini_gmos_south_ham, gemini_gnirs, gtc_osiris, - jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, - keck_kcwi, keck_lris_blue, keck_lris_blue_orig, - keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, - keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, - lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, - lbt_mods2r, ldt_deveny, magellan_fire, - magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, - mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, - not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, - p200_dbsp_red, p200_tspec, shane_kast_blue, - shane_kast_red, shane_kast_red_ret, soar_goodman_red, - tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, + gemini_gmos_south_ham, gemini_gnirs, gtc_maat, + gtc_osiris, gtc_osiris_plus, jwst_nircam, jwst_nirspec, + keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, + keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, + keck_lris_red_orig, keck_mosfire, keck_nires, + keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, + lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, + magellan_fire, magellan_fire_long, magellan_mage, + mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, + mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, + p200_dbsp_blue, p200_dbsp_red, p200_tspec, + shane_kast_blue, shane_kast_red, shane_kast_red_ret, + soar_goodman_blue, soar_goodman_red, tng_dolores, + vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red (default: None) -b BINNING, --binning BINNING diff --git a/doc/help/pypeit_view_fits.rst b/doc/help/pypeit_view_fits.rst index b4730714c1..efb4f521d9 100644 --- a/doc/help/pypeit_view_fits.rst +++ b/doc/help/pypeit_view_fits.rst @@ -3,6 +3,7 @@ $ pypeit_view_fits -h usage: pypeit_view_fits [-h] [--list] [--proc] [--bkg_file BKG_FILE] [--exten EXTEN] [--det [DET ...]] [--chname CHNAME] + [--embed] spectrograph file View FITS files with ginga @@ -12,17 +13,18 @@ gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, gemini_gmos_north_ham, gemini_gmos_north_ham_ns, gemini_gmos_south_ham, - gemini_gnirs, gtc_osiris, jwst_nircam, jwst_nirspec, - keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - keck_lris_red_orig, keck_mosfire, keck_nires, - keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, - lbt_mods1r, lbt_mods2b, lbt_mods2r, ldt_deveny, - magellan_fire, magellan_fire_long, magellan_mage, - mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, - mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, - p200_dbsp_blue, p200_dbsp_red, p200_tspec, - shane_kast_blue, shane_kast_red, shane_kast_red_ret, + gemini_gnirs, gtc_maat, gtc_osiris, gtc_osiris_plus, + jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + keck_kcwi, keck_lris_blue, keck_lris_blue_orig, + keck_lris_red, keck_lris_red_mark4, keck_lris_red_orig, + keck_mosfire, keck_nires, keck_nirspec_low, lbt_luci1, + lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, + lbt_mods2r, ldt_deveny, magellan_fire, + magellan_fire_long, magellan_mage, mdm_osmos_mdm4k, + mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, + not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + p200_dbsp_red, p200_tspec, shane_kast_blue, + shane_kast_red, shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, wht_isis_red @@ -41,9 +43,11 @@ --exten EXTEN Show a FITS extension in the raw file. Note --proc and --mosaic will not work with this option. (default: None) --det [DET ...] Detector(s) to show. If more than one, the list of - detectors must be one of the allowed mosaics hard-coded + detectors, i.e. --det 4 8 to show detectors 4 and 8. This + combination must be one of the allowed mosaics hard-coded for the selected spectrograph. Using "mosaic" for gemini_gmos, keck_deimos, or keck_lris will show the mosaic of all detectors. (default: 1) --chname CHNAME Name of Ginga tab (default: Image) + --embed Upon completion embed in ipython shell (default: False) \ No newline at end of file diff --git a/doc/help/run_pypeit.rst b/doc/help/run_pypeit.rst index 462291848d..f290b40302 100644 --- a/doc/help/run_pypeit.rst +++ b/doc/help/run_pypeit.rst @@ -9,18 +9,18 @@ ## Available spectrographs include: ## bok_bc, gemini_flamingos1, gemini_flamingos2, gemini_gmos_north_e2v, ## gemini_gmos_north_ham, gemini_gmos_north_ham_ns, - ## gemini_gmos_south_ham, gemini_gnirs, gtc_osiris, jwst_nircam, - ## jwst_nirspec, keck_deimos, keck_hires, keck_kcwi, keck_lris_blue, - ## keck_lris_blue_orig, keck_lris_red, keck_lris_red_mark4, - ## keck_lris_red_orig, keck_mosfire, keck_nires, keck_nirspec_low, - ## lbt_luci1, lbt_luci2, lbt_mods1b, lbt_mods1r, lbt_mods2b, lbt_mods2r, - ## ldt_deveny, magellan_fire, magellan_fire_long, magellan_mage, - ## mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, mmt_mmirs, not_alfosc, - ## not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, p200_dbsp_red, - ## p200_tspec, shane_kast_blue, shane_kast_red, shane_kast_red_ret, - ## soar_goodman_red, tng_dolores, vlt_fors2, vlt_sinfoni, - ## vlt_xshooter_nir, vlt_xshooter_uvb, vlt_xshooter_vis, wht_isis_blue, - ## wht_isis_red + ## gemini_gmos_south_ham, gemini_gnirs, gtc_maat, gtc_osiris, + ## gtc_osiris_plus, jwst_nircam, jwst_nirspec, keck_deimos, keck_hires, + ## keck_kcwi, keck_lris_blue, keck_lris_blue_orig, keck_lris_red, + ## keck_lris_red_mark4, keck_lris_red_orig, keck_mosfire, keck_nires, + ## keck_nirspec_low, lbt_luci1, lbt_luci2, lbt_mods1b, lbt_mods1r, + ## lbt_mods2b, lbt_mods2r, ldt_deveny, magellan_fire, magellan_fire_long, + ## magellan_mage, mdm_osmos_mdm4k, mmt_binospec, mmt_bluechannel, + ## mmt_mmirs, not_alfosc, not_alfosc_vert, ntt_efosc2, p200_dbsp_blue, + ## p200_dbsp_red, p200_tspec, shane_kast_blue, shane_kast_red, + ## shane_kast_red_ret, soar_goodman_blue, soar_goodman_red, tng_dolores, + ## vlt_fors2, vlt_sinfoni, vlt_xshooter_nir, vlt_xshooter_uvb, + ## vlt_xshooter_vis, wht_isis_blue, wht_isis_red positional arguments: pypeit_file PypeIt reduction file (must have .pypeit extension) diff --git a/doc/include/dependencies_table.rst b/doc/include/dependencies_table.rst index 7d7ddc2065..9c944ff1b7 100644 --- a/doc/include/dependencies_table.rst +++ b/doc/include/dependencies_table.rst @@ -1,5 +1,5 @@ ======================= ====================================================================================================================================================================================================================================================================== -Python Version ``>=3.8,<3.10`` +Python Version ``>=3.8,<3.11`` Required for users ``IPython>=7.10.0``, ``PyYAML>=5.1``, ``astropy>=4.3``, ``configobj>=5.0.6``, ``extension-helpers>=0.1``, ``ginga>=3.0``, ``linetools``, ``matplotlib>=3.3``, ``numpy>=1.20``, ``packaging>=0.19``, ``pygithub``, ``qtpy>=1.9``, ``scikit-learn>=1.0``, ``scipy>=1.6`` Required for developers ``codecov``, ``coverage``, ``pytest-astropy``, ``pytest-cov``, ``pytest>=6.0.0``, ``sphinx``, ``sphinx-automodapi``, ``sphinx_rtd_theme``, ``tox`` ======================= ====================================================================================================================================================================================================================================================================== diff --git a/doc/include/gemini_gnirs_A.pypeit.rst b/doc/include/gemini_gnirs_A.pypeit.rst index f106e95e07..3727437105 100644 --- a/doc/include/gemini_gnirs_A.pypeit.rst +++ b/doc/include/gemini_gnirs_A.pypeit.rst @@ -1,7 +1,7 @@ .. code-block:: console # Auto-generated PypeIt input file using PypeIt version: 1.12.1.dev1+gee479d62d.d20230131 - # UTC 2023-01-31T18:42:33.864 + # UTC 2023-02-21T16:56:32.287 # User-defined execution parameters [rdx] diff --git a/doc/include/inst_detector_table.rst b/doc/include/inst_detector_table.rst index 52ed3a9aa0..ba8fba9e19 100644 --- a/doc/include/inst_detector_table.rst +++ b/doc/include/inst_detector_table.rst @@ -17,8 +17,10 @@ Instrument Det specaxis specflip spatflip namp gain ... 2 1 False False 4 1.83, 1.83, 1.83, 1.83 3.98, 3.98, 3.98, 3.98 0.0 -1.0e+10 123000.0 0.9500 0.0800 ... 3 1 False False 4 1.83, 1.83, 1.83, 1.83 3.98, 3.98, 3.98, 3.98 0.0 -1.0e+10 125000.0 0.9500 0.0800 ``gemini_gnirs`` 1 0 True True 1 13.5 7.0 0.15 -1.0e+10 150000.0 0.7100 0.1500 +``gtc_maat`` 1 1 True False 1 1.9 4.3 0.0 0.0e+00 65535.0 0.9500 0.1250 ``gtc_osiris`` 1 0 False False 1 0.95 4.5 0.0 0.0e+00 65535.0 0.9500 0.1270 ... 2 0 False False 1 0.95 4.5 0.0 0.0e+00 65535.0 0.9500 0.1270 +``gtc_osiris_plus`` 1 1 True False 1 1.9 4.3 0.0 0.0e+00 65535.0 0.9500 0.1250 ``jwst_nircam`` 1 1 False False 1 1.84 8.55 0.0335 -1.0e+10 59200.0 0.9500 0.0630 ... 2 1 False False 1 1.8 8.57 0.035 -1.0e+10 58500.0 0.9500 0.0630 ``jwst_nirspec`` 1 1 False False 1 0.996 5.17 0.0092 -1.0e+10 55100.0 0.9500 0.1000 @@ -70,6 +72,7 @@ Instrument Det specaxis specflip spatflip namp gain ``shane_kast_blue`` 1 1 False False 2 1.2, 1.2 3.7, 3.7 0.0 -1.0e+10 65535.0 0.7600 0.4300 ``shane_kast_red`` 1 0 False False 2 1.9, 1.9 3.8, 3.8 0.0 -1.0e+10 65535.0 0.7600 0.4300 ``shane_kast_red_ret`` 1 1 False False 1 3.0 12.5 0.0 -1.0e+10 120000.0 0.7600 0.7740 +``soar_goodman_blue`` 1 1 False False 1 ``None`` ``None`` 8e-05 -1.0e+10 65535.0 1.0000 0.1500 ``soar_goodman_red`` 1 1 False False 1 ``None`` ``None`` 8e-05 -1.0e+10 65535.0 1.0000 0.1500 ``tng_dolores`` 1 1 False False 1 0.97 9.0 0.0 -1.0e+10 65500.0 0.9900 0.2520 ``vlt_fors2`` 1 1 False False 1 0.7 2.9 2.1 -1.0e+10 200000.0 0.8000 0.1260 diff --git a/doc/include/keck_deimos_A.pypeit.rst b/doc/include/keck_deimos_A.pypeit.rst index 9884f69ffc..ce57ad036d 100644 --- a/doc/include/keck_deimos_A.pypeit.rst +++ b/doc/include/keck_deimos_A.pypeit.rst @@ -1,7 +1,7 @@ .. code-block:: console # Auto-generated PypeIt input file using PypeIt version: 1.12.1.dev1+gee479d62d.d20230131 - # UTC 2023-01-31T18:42:33.386 + # UTC 2023-02-21T16:56:31.766 # User-defined execution parameters [rdx] diff --git a/doc/include/shane_kast_blue_A.pypeit.rst b/doc/include/shane_kast_blue_A.pypeit.rst index 479386780a..91ae783e2d 100644 --- a/doc/include/shane_kast_blue_A.pypeit.rst +++ b/doc/include/shane_kast_blue_A.pypeit.rst @@ -1,7 +1,7 @@ .. code-block:: console # Auto-generated PypeIt input file using PypeIt version: 1.12.1.dev1+gee479d62d.d20230131 - # UTC 2023-01-31T18:42:27.359 + # UTC 2023-02-21T16:56:26.081 # User-defined execution parameters [rdx] diff --git a/doc/include/spectrographs_table.rst b/doc/include/spectrographs_table.rst index 65eb9b5f36..6f9b2f071f 100644 --- a/doc/include/spectrographs_table.rst +++ b/doc/include/spectrographs_table.rst @@ -1,60 +1,61 @@ -======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ======================================================================================= -``PypeIt`` Name ``PypeIt`` Class Telescope Camera URL Pipeline Supported QL Tested Comments -======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ======================================================================================= -bok_bc :class:`~pypeit.spectrographs.bok_bc.BokBCSpectrograph` BOK BC `Link `__ MultiSlit True False Bok B&C spectrometer -gemini_flamingos1 :class:`~pypeit.spectrographs.gemini_flamingos.GeminiFLAMINGOS1Spectrograph` GEMINI-S FLAMINGOS `Link `__ MultiSlit False False -gemini_flamingos2 :class:`~pypeit.spectrographs.gemini_flamingos.GeminiFLAMINGOS2Spectrograph` GEMINI-S FLAMINGOS `Link `__ MultiSlit True False Flamingos-2 NIR spectrograph -gemini_gmos_north_e2v :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNE2VSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False E2V detector; see :doc:`gemini_gmos` -gemini_gmos_north_ham :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNHamSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False Hamamatsu detector (R400, B600, R831); Used since Feb 2017; see :doc:`gemini_gmos` -gemini_gmos_north_ham_ns :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNHamNSSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False Same as gemini_gmos_north_ham when used in nod-and-shuffle mode; see :doc:`gemini_gmos` -gemini_gmos_south_ham :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSSHamSpectrograph` GEMINI-S GMOS-S `Link `__ MultiSlit True False Hamamatsu detector (R400, B600, R831); see :doc:`gemini_gmos` -gemini_gnirs :class:`~pypeit.spectrographs.gemini_gnirs.GeminiGNIRSSpectrograph` GEMINI-N GNIRS `Link `__ Echelle True False -gtc_osiris :class:`~pypeit.spectrographs.gtc_osiris.GTCOSIRISSpectrograph` GTC OSIRIS `Link `__ MultiSlit True False See :doc:`gtc_osiris` -gtc_osiris_plus :class:`~pypeit.spectrographs.gtc_osiris.GTCOSIRISPlusSpectrograph` GTC OSIRIS+ `Link `__ MultiSlit True False See :doc:`gtc_osiris` -jwst_nircam :class:`~pypeit.spectrographs.jwst_nircam.JWSTNIRCamSpectrograph` JWST NIRCAM `Link `__ MultiSlit False False -jwst_nirspec :class:`~pypeit.spectrographs.jwst_nirspec.JWSTNIRSpecSpectrograph` JWST NIRSPEC `Link `__ MultiSlit True False -keck_deimos :class:`~pypeit.spectrographs.keck_deimos.KeckDEIMOSSpectrograph` KECK DEIMOS `Link `__ MultiSlit True True Supported gratings: 600ZD, 830G, 900ZD, 1200B, 1200G; see :doc:`deimos` -keck_hires :class:`~pypeit.spectrographs.keck_hires.KECKHIRESSpectrograph` KECK HIRES `Link `__ Echelle True False -keck_kcwi :class:`~pypeit.spectrographs.keck_kcwi.KeckKCWISpectrograph` KECK KCWI `Link `__ IFU True False Supported setups: BM, BH2; see :doc:`keck_kcwi` -keck_lris_blue :class:`~pypeit.spectrographs.keck_lris.KeckLRISBSpectrograph` KECK LRISb `Link `__ MultiSlit True False Blue camera; see :doc:`lris` -keck_lris_blue_orig :class:`~pypeit.spectrographs.keck_lris.KeckLRISBOrigSpectrograph` KECK LRISb `Link `__ MultiSlit True False Original detector; replaced in 20??; see :doc:`lris` -keck_lris_red :class:`~pypeit.spectrographs.keck_lris.KeckLRISRSpectrograph` KECK LRISr `Link `__ MultiSlit True True Red camera; LBNL detector, 2kx4k; see :doc:`lris` -keck_lris_red_mark4 :class:`~pypeit.spectrographs.keck_lris.KeckLRISRMark4Spectrograph` KECK LRISr `Link `__ MultiSlit True True New Mark4 detector, circa Spring 2021; Supported setups = R400 -keck_lris_red_orig :class:`~pypeit.spectrographs.keck_lris.KeckLRISROrigSpectrograph` KECK LRISr `Link `__ MultiSlit True True Original detector; replaced in 2009; see :doc:`lris` -keck_mosfire :class:`~pypeit.spectrographs.keck_mosfire.KeckMOSFIRESpectrograph` KECK MOSFIRE `Link `__ MultiSlit True False Gratings tested: Y, J, J2, H, K; see :doc:`mosfire` -keck_nires :class:`~pypeit.spectrographs.keck_nires.KeckNIRESSpectrograph` KECK NIRES `Link `__ Echelle True False -keck_nirspec_low :class:`~pypeit.spectrographs.keck_nirspec.KeckNIRSPECLowSpectrograph` KECK NIRSPEC `Link `__ MultiSlit True False Low-dispersion grating -lbt_luci1 :class:`~pypeit.spectrographs.lbt_luci.LBTLUCI1Spectrograph` LBT LUCI1 `Link `__ MultiSlit True False -lbt_luci2 :class:`~pypeit.spectrographs.lbt_luci.LBTLUCI2Spectrograph` LBT LUCI2 `Link `__ MultiSlit True False -lbt_mods1b :class:`~pypeit.spectrographs.lbt_mods.LBTMODS1BSpectrograph` LBT MODS1B `Link `__ MultiSlit True False MODS-I blue spectrometer -lbt_mods1r :class:`~pypeit.spectrographs.lbt_mods.LBTMODS1RSpectrograph` LBT MODS1R `Link `__ MultiSlit True False MODS-I red spectrometer -lbt_mods2b :class:`~pypeit.spectrographs.lbt_mods.LBTMODS2BSpectrograph` LBT MODS2B `Link `__ MultiSlit True False MODS-II blue spectrometer -lbt_mods2r :class:`~pypeit.spectrographs.lbt_mods.LBTMODS2RSpectrograph` LBT MODS2R `Link `__ MultiSlit True False MODS-II red spectrometer -ldt_deveny :class:`~pypeit.spectrographs.ldt_deveny.LDTDeVenySpectrograph` LDT DeVeny `Link `__ MultiSlit True False LDT DeVeny Optical Spectrograph -magellan_fire :class:`~pypeit.spectrographs.magellan_fire.MagellanFIREEchelleSpectrograph` MAGELLAN FIRE `Link `__ Echelle True False Magellan/FIRE in echelle mode -magellan_fire_long :class:`~pypeit.spectrographs.magellan_fire.MagellanFIRELONGSpectrograph` MAGELLAN FIRE `Link `__ MultiSlit True False Magellan/FIRE in long-slit/high-throughput mode -magellan_mage :class:`~pypeit.spectrographs.magellan_mage.MagellanMAGESpectrograph` MAGELLAN MagE `Link `__ Echelle True False See :doc:`mage` -mdm_osmos_mdm4k :class:`~pypeit.spectrographs.mdm_osmos.MDMOSMOSMDM4KSpectrograph` KPNO MDM4K `Link `__ MultiSlit True False MDM OSMOS spectrometer -mmt_binospec :class:`~pypeit.spectrographs.mmt_binospec.MMTBINOSPECSpectrograph` MMT BINOSPEC `Link `__ MultiSlit True False -mmt_bluechannel :class:`~pypeit.spectrographs.mmt_bluechannel.MMTBlueChannelSpectrograph` MMT Blue_Channel `Link `__ MultiSlit True False -mmt_mmirs :class:`~pypeit.spectrographs.mmt_mmirs.MMTMMIRSSpectrograph` MMT MMIRS `Link `__ MultiSlit True False -not_alfosc :class:`~pypeit.spectrographs.not_alfosc.NOTALFOSCSpectrograph` NOT ALFOSC `Link `__ MultiSlit True False For use with the standard horizontal slits only. Grisms 4, 7, 8, 17, 18, 19 -not_alfosc_vert :class:`~pypeit.spectrographs.not_alfosc.NOTALFOSCSpectrographVert` NOT ALFOSC `Link `__ MultiSlit True False Grisms 4, 7, 8, 17, 18, 19. For vertical slits only -ntt_efosc2 :class:`~pypeit.spectrographs.ntt_efosc2.NTTEFOSC2Spectrograph` NTT EFOSC2 `Link `__ MultiSlit True False The ESO Faint Object Spectrograph and Camera version 2 -p200_dbsp_blue :class:`~pypeit.spectrographs.p200_dbsp.P200DBSPBlueSpectrograph` P200 DBSPb `Link `__ MultiSlit True False Blue camera -p200_dbsp_red :class:`~pypeit.spectrographs.p200_dbsp.P200DBSPRedSpectrograph` P200 DBSPr `Link `__ MultiSlit True False Red camera -p200_tspec :class:`~pypeit.spectrographs.p200_tspec.P200TSPECSpectrograph` P200 TSPEC `Link `__ Echelle True False TripleSpec spectrograph -shane_kast_blue :class:`~pypeit.spectrographs.shane_kast.ShaneKastBlueSpectrograph` SHANE KASTb `Link `__ MultiSlit True True -shane_kast_red :class:`~pypeit.spectrographs.shane_kast.ShaneKastRedSpectrograph` SHANE KASTr `Link `__ MultiSlit True True -shane_kast_red_ret :class:`~pypeit.spectrographs.shane_kast.ShaneKastRedRetSpectrograph` SHANE KASTr `Link `__ MultiSlit True True Red reticon -soar_goodman_red :class:`~pypeit.spectrographs.soar_goodman.SOARGoodmanRedSpectrograph` SOAR red `Link `__ MultiSlit True False Supported gratings: 400_SYZY at M1 and M2 tilts -soar_goodman_blue :class:`~pypeit.spectrographs.soar_goodman.SOARGoodmanBlueSpectrograph` SOAR blue `Link `__ MultiSlit True False Supported gratings: 400_SYZY at M1 tilts -tng_dolores :class:`~pypeit.spectrographs.tng_dolores.TNGDoloresSpectrograph` TNG DOLORES `Link `__ MultiSlit False False DOLORES (LRS) spectrograph; LR-R -vlt_fors2 :class:`~pypeit.spectrographs.vlt_fors.VLTFORS2Spectrograph` VLT FORS2 `Link `__ MultiSlit True False 300I, 300V gratings -vlt_sinfoni :class:`~pypeit.spectrographs.vlt_sinfoni.VLTSINFONISpectrograph` VLT SINFONI `Link `__ MultiSlit True False Gratings tested: K -vlt_xshooter_nir :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterNIRSpectrograph` VLT XShooter_NIR `Link `__ Echelle True False See :doc:`xshooter` -vlt_xshooter_uvb :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterUVBSpectrograph` VLT XShooter_UVB `Link `__ Echelle True False See :doc:`xshooter` -vlt_xshooter_vis :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterVISSpectrograph` VLT XShooter_VIS `Link `__ Echelle True False See :doc:`xshooter` -wht_isis_blue :class:`~pypeit.spectrographs.wht_isis.WHTISISBlueSpectrograph` WHT ISISb `Link `__ MultiSlit False False Blue camera -wht_isis_red :class:`~pypeit.spectrographs.wht_isis.WHTISISRedSpectrograph` WHT ISISr `Link `__ MultiSlit False False Red camera -======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ======================================================================================= +======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ============================================================================================= +``PypeIt`` Name ``PypeIt`` Class Telescope Camera URL Pipeline Supported QL Tested Comments +======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ============================================================================================= +bok_bc :class:`~pypeit.spectrographs.bok_bc.BokBCSpectrograph` BOK BC `Link `__ MultiSlit True False Bok B&C spectrometer +gemini_flamingos1 :class:`~pypeit.spectrographs.gemini_flamingos.GeminiFLAMINGOS1Spectrograph` GEMINI-S FLAMINGOS `Link `__ MultiSlit False False +gemini_flamingos2 :class:`~pypeit.spectrographs.gemini_flamingos.GeminiFLAMINGOS2Spectrograph` GEMINI-S FLAMINGOS `Link `__ MultiSlit True False Flamingos-2 NIR spectrograph +gemini_gmos_north_e2v :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNE2VSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False E2V detector; see :doc:`gemini_gmos` +gemini_gmos_north_ham :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNHamSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False Hamamatsu detector (R400, B600, R831); Used since Feb 2017; see :doc:`gemini_gmos` +gemini_gmos_north_ham_ns :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSNHamNSSpectrograph` GEMINI-N GMOS-N `Link `__ MultiSlit True False Same as gemini_gmos_north_ham when used in nod-and-shuffle mode; see :doc:`gemini_gmos` +gemini_gmos_south_ham :class:`~pypeit.spectrographs.gemini_gmos.GeminiGMOSSHamSpectrograph` GEMINI-S GMOS-S `Link `__ MultiSlit True False Hamamatsu detector (R400, B600, R831); see :doc:`gemini_gmos` +gemini_gnirs :class:`~pypeit.spectrographs.gemini_gnirs.GeminiGNIRSSpectrograph` GEMINI-N GNIRS `Link `__ Echelle True False +gtc_maat :class:`~pypeit.spectrographs.gtc_osiris.GTCMAATSpectrograph` GTC OSIRIS `Link `__ IFU True False See :doc:`gtc_osiris` +gtc_osiris :class:`~pypeit.spectrographs.gtc_osiris.GTCOSIRISSpectrograph` GTC OSIRIS `Link `__ MultiSlit True False See :doc:`gtc_osiris` +gtc_osiris_plus :class:`~pypeit.spectrographs.gtc_osiris.GTCOSIRISPlusSpectrograph` GTC OSIRIS `Link `__ MultiSlit True False See :doc:`gtc_osiris` +jwst_nircam :class:`~pypeit.spectrographs.jwst_nircam.JWSTNIRCamSpectrograph` JWST NIRCAM `Link `__ MultiSlit False False +jwst_nirspec :class:`~pypeit.spectrographs.jwst_nirspec.JWSTNIRSpecSpectrograph` JWST NIRSPEC `Link `__ MultiSlit True False +keck_deimos :class:`~pypeit.spectrographs.keck_deimos.KeckDEIMOSSpectrograph` KECK DEIMOS `Link `__ MultiSlit True True Supported gratings: 600ZD, 830G, 900ZD, 1200B, 1200G; see :doc:`deimos` +keck_hires :class:`~pypeit.spectrographs.keck_hires.KECKHIRESSpectrograph` KECK HIRES `Link `__ Echelle True False +keck_kcwi :class:`~pypeit.spectrographs.keck_kcwi.KeckKCWISpectrograph` KECK KCWI `Link `__ IFU True False Supported setups: BM, BH2; see :doc:`keck_kcwi` +keck_lris_blue :class:`~pypeit.spectrographs.keck_lris.KeckLRISBSpectrograph` KECK LRISb `Link `__ MultiSlit True False Blue camera; see :doc:`lris` +keck_lris_blue_orig :class:`~pypeit.spectrographs.keck_lris.KeckLRISBOrigSpectrograph` KECK LRISb `Link `__ MultiSlit True False Original detector; replaced in 20??; see :doc:`lris` +keck_lris_red :class:`~pypeit.spectrographs.keck_lris.KeckLRISRSpectrograph` KECK LRISr `Link `__ MultiSlit True True Red camera; LBNL detector, 2kx4k; see :doc:`lris` +keck_lris_red_mark4 :class:`~pypeit.spectrographs.keck_lris.KeckLRISRMark4Spectrograph` KECK LRISr `Link `__ MultiSlit True True New Mark4 detector, circa Spring 2021; Supported setups = R400 +keck_lris_red_orig :class:`~pypeit.spectrographs.keck_lris.KeckLRISROrigSpectrograph` KECK LRISr `Link `__ MultiSlit True True Original detector; replaced in 2009; see :doc:`lris` +keck_mosfire :class:`~pypeit.spectrographs.keck_mosfire.KeckMOSFIRESpectrograph` KECK MOSFIRE `Link `__ MultiSlit True False Gratings tested: Y, J, J2, H, K; see :doc:`mosfire` +keck_nires :class:`~pypeit.spectrographs.keck_nires.KeckNIRESSpectrograph` KECK NIRES `Link `__ Echelle True False +keck_nirspec_low :class:`~pypeit.spectrographs.keck_nirspec.KeckNIRSPECLowSpectrograph` KECK NIRSPEC `Link `__ MultiSlit True False Low-dispersion grating +lbt_luci1 :class:`~pypeit.spectrographs.lbt_luci.LBTLUCI1Spectrograph` LBT LUCI1 `Link `__ MultiSlit True False +lbt_luci2 :class:`~pypeit.spectrographs.lbt_luci.LBTLUCI2Spectrograph` LBT LUCI2 `Link `__ MultiSlit True False +lbt_mods1b :class:`~pypeit.spectrographs.lbt_mods.LBTMODS1BSpectrograph` LBT MODS1B `Link `__ MultiSlit True False MODS-I blue spectrometer +lbt_mods1r :class:`~pypeit.spectrographs.lbt_mods.LBTMODS1RSpectrograph` LBT MODS1R `Link `__ MultiSlit True False MODS-I red spectrometer +lbt_mods2b :class:`~pypeit.spectrographs.lbt_mods.LBTMODS2BSpectrograph` LBT MODS2B `Link `__ MultiSlit True False MODS-II blue spectrometer +lbt_mods2r :class:`~pypeit.spectrographs.lbt_mods.LBTMODS2RSpectrograph` LBT MODS2R `Link `__ MultiSlit True False MODS-II red spectrometer +ldt_deveny :class:`~pypeit.spectrographs.ldt_deveny.LDTDeVenySpectrograph` LDT DeVeny `Link `__ MultiSlit True False LDT DeVeny Optical Spectrograph +magellan_fire :class:`~pypeit.spectrographs.magellan_fire.MagellanFIREEchelleSpectrograph` MAGELLAN FIRE `Link `__ Echelle True False Magellan/FIRE in echelle mode +magellan_fire_long :class:`~pypeit.spectrographs.magellan_fire.MagellanFIRELONGSpectrograph` MAGELLAN FIRE `Link `__ MultiSlit True False Magellan/FIRE in long-slit/high-throughput mode +magellan_mage :class:`~pypeit.spectrographs.magellan_mage.MagellanMAGESpectrograph` MAGELLAN MagE `Link `__ Echelle True False See :doc:`mage` +mdm_osmos_mdm4k :class:`~pypeit.spectrographs.mdm_osmos.MDMOSMOSMDM4KSpectrograph` KPNO MDM4K `Link `__ MultiSlit True False MDM OSMOS spectrometer +mmt_binospec :class:`~pypeit.spectrographs.mmt_binospec.MMTBINOSPECSpectrograph` MMT BINOSPEC `Link `__ MultiSlit True False +mmt_bluechannel :class:`~pypeit.spectrographs.mmt_bluechannel.MMTBlueChannelSpectrograph` MMT Blue_Channel `Link `__ MultiSlit True False +mmt_mmirs :class:`~pypeit.spectrographs.mmt_mmirs.MMTMMIRSSpectrograph` MMT MMIRS `Link `__ MultiSlit True False +not_alfosc :class:`~pypeit.spectrographs.not_alfosc.NOTALFOSCSpectrograph` NOT ALFOSC `Link `__ MultiSlit True False For use with the standard horizontal slits only. Grisms 3, 4, 5, 7, 8, 10, 11, 17, 18, 19, 20 +not_alfosc_vert :class:`~pypeit.spectrographs.not_alfosc.NOTALFOSCSpectrographVert` NOT ALFOSC `Link `__ MultiSlit True False Grisms 3, 4, 5, 7, 8, 10, 11, 17, 18, 19, 20. For vertical slits only +ntt_efosc2 :class:`~pypeit.spectrographs.ntt_efosc2.NTTEFOSC2Spectrograph` NTT EFOSC2 `Link `__ MultiSlit True False The ESO Faint Object Spectrograph and Camera version 2 +p200_dbsp_blue :class:`~pypeit.spectrographs.p200_dbsp.P200DBSPBlueSpectrograph` P200 DBSPb `Link `__ MultiSlit True False Blue camera +p200_dbsp_red :class:`~pypeit.spectrographs.p200_dbsp.P200DBSPRedSpectrograph` P200 DBSPr `Link `__ MultiSlit True False Red camera +p200_tspec :class:`~pypeit.spectrographs.p200_tspec.P200TSPECSpectrograph` P200 TSPEC `Link `__ Echelle True False TripleSpec spectrograph +shane_kast_blue :class:`~pypeit.spectrographs.shane_kast.ShaneKastBlueSpectrograph` SHANE KASTb `Link `__ MultiSlit True True +shane_kast_red :class:`~pypeit.spectrographs.shane_kast.ShaneKastRedSpectrograph` SHANE KASTr `Link `__ MultiSlit True True +shane_kast_red_ret :class:`~pypeit.spectrographs.shane_kast.ShaneKastRedRetSpectrograph` SHANE KASTr `Link `__ MultiSlit True True Red reticon +soar_goodman_blue :class:`~pypeit.spectrographs.soar_goodman.SOARGoodmanBlueSpectrograph` SOAR blue `Link `__ MultiSlit True False Supported gratings: 400_SYZY at M1 tilt +soar_goodman_red :class:`~pypeit.spectrographs.soar_goodman.SOARGoodmanRedSpectrograph` SOAR red `Link `__ MultiSlit True False Supported gratings: 400_SYZY at M1 and M2 tilts +tng_dolores :class:`~pypeit.spectrographs.tng_dolores.TNGDoloresSpectrograph` TNG DOLORES `Link `__ MultiSlit False False DOLORES (LRS) spectrograph; LR-R +vlt_fors2 :class:`~pypeit.spectrographs.vlt_fors.VLTFORS2Spectrograph` VLT FORS2 `Link `__ MultiSlit True False 300I, 300V gratings +vlt_sinfoni :class:`~pypeit.spectrographs.vlt_sinfoni.VLTSINFONISpectrograph` VLT SINFONI `Link `__ MultiSlit True False Gratings tested: K +vlt_xshooter_nir :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterNIRSpectrograph` VLT XShooter_NIR `Link `__ Echelle True False See :doc:`xshooter` +vlt_xshooter_uvb :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterUVBSpectrograph` VLT XShooter_UVB `Link `__ Echelle True False See :doc:`xshooter` +vlt_xshooter_vis :class:`~pypeit.spectrographs.vlt_xshooter.VLTXShooterVISSpectrograph` VLT XShooter_VIS `Link `__ Echelle True False See :doc:`xshooter` +wht_isis_blue :class:`~pypeit.spectrographs.wht_isis.WHTISISBlueSpectrograph` WHT ISISb `Link `__ MultiSlit False False Blue camera +wht_isis_red :class:`~pypeit.spectrographs.wht_isis.WHTISISRedSpectrograph` WHT ISISr `Link `__ MultiSlit False False Red camera +======================== ============================================================================ ========= ============ =============================================================================================================================== ========= ========= ========= ============================================================================================= diff --git a/doc/out_onespec.rst b/doc/out_onespec.rst index c79f0877ff..b869f81d10 100644 --- a/doc/out_onespec.rst +++ b/doc/out_onespec.rst @@ -15,7 +15,7 @@ spectrum per source, fully calibrated and (as desired) with a :doc:`telluric` performed. The standard way to generate this file is -with the :ref:`_pypeit_coadd_1dspec` script. +with the :ref:`pypeit_coadd_1dspec` script. The naming of this file is user-generated, i.e. it can be anything you wish. @@ -49,4 +49,5 @@ first HDU of the file. .. include:: include/datamodel_onespec.rst All wavelengths are in vacuum and flux units -depend on whether :doc:`Fluxing` was performed. +depend on whether :doc:`fluxing` was performed. + diff --git a/doc/outputs.rst b/doc/outputs.rst index 30087b9a38..0a3c70a200 100644 --- a/doc/outputs.rst +++ b/doc/outputs.rst @@ -93,6 +93,15 @@ Importantly note that: - the output of :ref:`pypeit_collate_1d` is identical to :ref:`pypeit_coadd_1dspec` +Generally, the further processing scripts that produce 1D spectra that do *not* +make direct changes to the :ref:`spec-1d-output`, produce ``OneSpec`` files. +See: + +.. toctree:: + :maxdepth: 1 + + out_onespec + ---- Common Output Components diff --git a/doc/pypeit_par.rst b/doc/pypeit_par.rst index 26da0389fb..c4ac0b4c9c 100644 --- a/doc/pypeit_par.rst +++ b/doc/pypeit_par.rst @@ -1798,6 +1798,114 @@ Alterations to the default parameters are: [[IR]] telgridfile = TelFit_MaunaKea_3100_26100_R20000.fits +.. _instr_par-gtc_maat: + +GTC OSIRIS (``gtc_maat``) +------------------------- +Alterations to the default parameters are: + +.. code-block:: ini + + [rdx] + spectrograph = gtc_maat + [calibrations] + [[biasframe]] + exprng = None, 1 + [[[process]]] + combine = median + use_biasimage = False + shot_noise = False + use_pixelflat = False + use_illumflat = False + [[darkframe]] + exprng = 999999, None + [[[process]]] + mask_cr = True + use_pixelflat = False + use_illumflat = False + [[arcframe]] + [[[process]]] + clip = False + use_pixelflat = False + use_illumflat = False + subtract_continuum = True + [[tiltframe]] + [[[process]]] + clip = False + use_pixelflat = False + use_illumflat = False + subtract_continuum = True + [[pixelflatframe]] + [[[process]]] + combine = median + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[pinholeframe]] + exprng = 999999, None + [[alignframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[traceframe]] + [[[process]]] + use_pixelflat = False + use_illumflat = False + [[illumflatframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[lampoffflatsframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[skyframe]] + [[[process]]] + mask_cr = True + noise_floor = 0.01 + [[standardframe]] + exprng = None, 180 + [[[process]]] + mask_cr = True + noise_floor = 0.01 + [[flatfield]] + slit_illum_finecorr = False + [[wavelengths]] + method = full_template + lamps = XeI,HgI,NeI,ArI + [[slitedges]] + sync_predict = nearest + bound_detector = True + [[tilts]] + spat_order = 1 + spec_order = 1 + [scienceframe] + exprng = 90, None + [[process]] + mask_cr = True + sigclip = 4.0 + objlim = 1.5 + use_biasimage = False + noise_floor = 0.01 + use_illumflat = False + [reduce] + [[findobj]] + maxnumber_std = 1 + skip_final_global = True + skip_skysub = True + [[skysub]] + no_poly = True + [[extraction]] + skip_extraction = True + [flexure] + spec_maxshift = 2.5 + [sensfunc] + [[UVIS]] + extinct_correct = False + .. _instr_par-gtc_osiris: GTC OSIRIS (``gtc_osiris``) @@ -1891,6 +1999,99 @@ Alterations to the default parameters are: [[skysub]] no_poly = True +.. _instr_par-gtc_osiris_plus: + +GTC OSIRIS (``gtc_osiris_plus``) +-------------------------------- +Alterations to the default parameters are: + +.. code-block:: ini + + [rdx] + spectrograph = gtc_osiris_plus + [calibrations] + [[biasframe]] + exprng = None, 1 + [[[process]]] + combine = median + use_biasimage = False + shot_noise = False + use_pixelflat = False + use_illumflat = False + [[darkframe]] + exprng = 999999, None + [[[process]]] + mask_cr = True + use_pixelflat = False + use_illumflat = False + [[arcframe]] + [[[process]]] + clip = False + use_pixelflat = False + use_illumflat = False + subtract_continuum = True + [[tiltframe]] + [[[process]]] + clip = False + use_pixelflat = False + use_illumflat = False + subtract_continuum = True + [[pixelflatframe]] + [[[process]]] + combine = median + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[pinholeframe]] + exprng = 999999, None + [[alignframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[traceframe]] + [[[process]]] + use_pixelflat = False + use_illumflat = False + [[illumflatframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[lampoffflatsframe]] + [[[process]]] + satpix = nothing + use_pixelflat = False + use_illumflat = False + [[skyframe]] + [[[process]]] + mask_cr = True + noise_floor = 0.01 + [[standardframe]] + exprng = None, 180 + [[[process]]] + mask_cr = True + noise_floor = 0.01 + [[wavelengths]] + method = full_template + lamps = XeI,HgI,NeI,ArI + [[slitedges]] + sync_predict = nearest + bound_detector = True + [[tilts]] + spat_order = 5 + spec_order = 5 + [scienceframe] + exprng = 90, None + [[process]] + mask_cr = True + noise_floor = 0.01 + [reduce] + [[findobj]] + maxnumber_std = 1 + [[skysub]] + no_poly = True + .. _instr_par-jwst_nircam: JWST NIRCAM (``jwst_nircam``) @@ -4868,6 +5069,7 @@ Alterations to the default parameters are: lamps = HeI, NeI, ArI, ArII sigdetect = 10.0 [[slitedges]] + edge_thresh = 30 sync_predict = nearest bound_detector = True minimum_slit_gap = 15 @@ -4969,6 +5171,7 @@ Alterations to the default parameters are: lamps = HeI, NeI, ArI, ArII sigdetect = 10.0 [[slitedges]] + edge_thresh = 30 sync_predict = nearest bound_detector = True minimum_slit_gap = 15 @@ -5648,6 +5851,103 @@ Alterations to the default parameters are: [flexure] spec_method = boxcar +.. _instr_par-soar_goodman_blue: + +SOAR blue (``soar_goodman_blue``) +--------------------------------- +Alterations to the default parameters are: + +.. code-block:: ini + + [rdx] + spectrograph = soar_goodman_blue + [calibrations] + [[biasframe]] + [[[process]]] + combine = median + use_biasimage = False + shot_noise = False + use_pixelflat = False + use_illumflat = False + [[darkframe]] + [[[process]]] + mask_cr = True + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[arcframe]] + exprng = None, 30 + [[[process]]] + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[tiltframe]] + [[[process]]] + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[pixelflatframe]] + [[[process]]] + satpix = nothing + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[pinholeframe]] + [[[process]]] + use_biasimage = False + [[alignframe]] + [[[process]]] + satpix = nothing + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[traceframe]] + [[[process]]] + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[illumflatframe]] + [[[process]]] + satpix = nothing + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[lampoffflatsframe]] + [[[process]]] + satpix = nothing + use_biasimage = False + use_pixelflat = False + use_illumflat = False + [[skyframe]] + [[[process]]] + mask_cr = True + use_biasimage = False + noise_floor = 0.01 + [[standardframe]] + exprng = None, 120 + [[[process]]] + mask_cr = True + use_biasimage = False + noise_floor = 0.01 + [[wavelengths]] + lamps = NeI, ArI, HgI + fwhm = 5.0 + rms_threshold = 0.5 + [[slitedges]] + sync_predict = nearest + bound_detector = True + [scienceframe] + exprng = 90, None + [[process]] + mask_cr = True + use_biasimage = False + noise_floor = 0.01 + [flexure] + spec_method = boxcar + [sensfunc] + [[IR]] + telgridfile = TelFit_LasCampanas_3100_26100_R20000.fits + .. _instr_par-soar_goodman_red: SOAR red (``soar_goodman_red``) diff --git a/doc/releases/1.12.1.rst b/doc/releases/1.12.1.rst new file mode 100644 index 0000000000..b10f726bc6 --- /dev/null +++ b/doc/releases/1.12.1.rst @@ -0,0 +1,21 @@ + +Version 1.12.1 +============== + +Instrument-specific Updates +--------------------------- + +- Implemented the upgraded GTC/OSIRIS+ +- Added support for more NOT/ALFOSC grisms as well as NOT recommended standards +- Implemented the SOAR/Goodman (blue) M1 only + +Hotfixes +-------- + +- Specify sphinx versions to correctly work with sphinx_rtd_theme +- Fixed bug that caused crash of sensfunc routines using telluric grids in offline processing +- Fixed error when showing flats in Ginga when the fine correction is not performed +- Fixed keymap error when displaying GUIs + + + diff --git a/doc/spectrographs/not_alfosc.rst b/doc/spectrographs/not_alfosc.rst index 0a312dd18d..e7789f65b7 100644 --- a/doc/spectrographs/not_alfosc.rst +++ b/doc/spectrographs/not_alfosc.rst @@ -15,16 +15,25 @@ Common Items Grisms ++++++ -Currently only grisms 3, 4, 5, 7, 8, 10, 11 17, 18, 19 and 20 have full template solutions. +Currently only grisms 3, 4, 5, 7, 8, 10, 11 17, 18, 19 and 20 have full template +solutions. -Grisms 10 and 11 are very low-resolution and only occupy part of the detector. Depending on the window used, it may be useful to set the find_min_max parameter to some suitable range, e.g., -[reduce] - [[findobj]] - find_min_max = [0,680] -Furthermore, grisms 10 and 11 are so low resolution that the rms of the wavelength solution is often quite poor (roughly 0.2 pixels). +Grisms 10 and 11 are very low-resolution and only occupy part of the detector. +Depending on the window used, it may be useful to set the find_min_max parameter +to some suitable range, e.g., + +.. code-block:: ini + + [reduce] + [[findobj]] + find_min_max = [0,680] + +Furthermore, grisms 10 and 11 are so low resolution that the rms of the +wavelength solution is often quite poor (roughly 0.2 pixels). Vertical slits ++++++++++++++ For vertical slits, the spectrograph class not_alfosc_vert should be used. + diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst index 9836d01cd3..6a75332dac 100644 --- a/doc/whatsnew.rst +++ b/doc/whatsnew.rst @@ -15,6 +15,10 @@ For a detailed log of code edits (including releases earlier than version ---- +.. include:: releases/1.12.1.rst + +---- + .. include:: releases/1.12.0.rst ----