Skip to content

Commit

Permalink
Merge pull request #1847 from pypeit/bh3_support
Browse files Browse the repository at this point in the history
Keck/KCWI BH3 support
  • Loading branch information
rcooke-ast authored Sep 11, 2024
2 parents 46bb91a + bd688ed commit 3d26a0b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/include/spectrographs_table.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ keck_deimos :class:`~pypeit.spectrographs.keck_deimos.KeckDEIMOSSp
keck_esi :class:`~pypeit.spectrographs.keck_esi.KeckESISpectrograph` KECK ESI Echelle True False
keck_hires :class:`~pypeit.spectrographs.keck_hires.KECKHIRESSpectrograph` KECK HIRES `Link <https://www2.keck.hawaii.edu/inst/hires/>`__ Echelle False False Post detector upgrade (~ August 2004). See :doc:`keck_hires`
keck_kcrm :class:`~pypeit.spectrographs.keck_kcwi.KeckKCRMSpectrograph` KECK KCRM `Link <https://www2.keck.hawaii.edu/inst/kcwi/>`__ SlicerIFU True False Supported setups: RL, RM1, RM2, RH3; see :doc:`keck_kcwi`
keck_kcwi :class:`~pypeit.spectrographs.keck_kcwi.KeckKCWISpectrograph` KECK KCWI `Link <https://www2.keck.hawaii.edu/inst/kcwi/>`__ SlicerIFU True False Supported setups: BL, BM, BH2; see :doc:`keck_kcwi`
keck_kcwi :class:`~pypeit.spectrographs.keck_kcwi.KeckKCWISpectrograph` KECK KCWI `Link <https://www2.keck.hawaii.edu/inst/kcwi/>`__ SlicerIFU True False Supported setups: BL, BM, BH2, BH3; see :doc:`keck_kcwi`
keck_lris_blue :class:`~pypeit.spectrographs.keck_lris.KeckLRISBSpectrograph` KECK LRISb `Link <https://www2.keck.hawaii.edu/inst/lris/>`__ MultiSlit True False Blue camera; Current FITS file format; used from May 2009, see :doc:`lris`
keck_lris_blue_orig :class:`~pypeit.spectrographs.keck_lris.KeckLRISBOrigSpectrograph` KECK LRISb `Link <https://www2.keck.hawaii.edu/inst/lris/>`__ MultiSlit True False Blue camera; Original FITS file format; used until April 2009; see :doc:`lris`
keck_lris_red :class:`~pypeit.spectrographs.keck_lris.KeckLRISRSpectrograph` KECK LRISr `Link <https://www2.keck.hawaii.edu/inst/lris/>`__ MultiSlit True True Red camera; Current FITS file format; LBNL detector, 2kx4k; used from May 2009, see :doc:`lris`
Expand Down
1 change: 1 addition & 0 deletions doc/releases/1.16.1dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Instrument-specific Updates

- Improved LRIS frame typing, including the typing of slitless flats and sky flats.
- Improved HIRES frame typing and configuration setup.
- Added support for Keck/KCWI BH3 grating configuration.
- Added support for the (decommissioned) AAT/UHRF instrument
- Updated the requirements of a spectral flip for KCWI (blue) data. If all amplifiers are
used, the data will be flipped. If all amplifiers are used, the data will not be flipped.
Expand Down
Binary file not shown.
4 changes: 3 additions & 1 deletion pypeit/spectrographs/keck_kcwi.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ def config_specific_par(self, scifile, inp_par=None):
par['calibrations']['wavelengths']['lamps'] = ['FeI', 'ArI', 'ArII']
if self.get_meta_value(headarr, 'dispname') == 'BH2':
par['calibrations']['wavelengths']['reid_arxiv'] = 'keck_kcwi_BH2.fits'
elif self.get_meta_value(headarr, 'dispname') == 'BH3':
par['calibrations']['wavelengths']['reid_arxiv'] = 'keck_kcwi_BH3.fits'
elif self.get_meta_value(headarr, 'dispname') == 'BM':
par['calibrations']['wavelengths']['reid_arxiv'] = 'keck_kcwi_BM.fits'
elif self.get_meta_value(headarr, 'dispname') == 'BL':
Expand Down Expand Up @@ -825,7 +827,7 @@ class KeckKCWISpectrograph(KeckKCWIKCRMSpectrograph):
camera = 'KCWI'
url = 'https://www2.keck.hawaii.edu/inst/kcwi/'
header_name = 'KCWI'
comment = 'Supported setups: BL, BM, BH2; see :doc:`keck_kcwi`'
comment = 'Supported setups: BL, BM, BH2, BH3; see :doc:`keck_kcwi`'

def get_detector_par(self, det, hdu=None):
"""
Expand Down

0 comments on commit 3d26a0b

Please sign in to comment.