Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/pypeit/PypeIt into sensf…
Browse files Browse the repository at this point in the history 
…unc_blaze_jwst_lists
  • Loading branch information
@jhennawi
jhennawi committed Jul 13, 2023
2 parents 0d7aa80 + 435819b commit e0e14a4
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
1.13.1dev (6 June 2023)
------------------------

- Hotfix for GTC/OSIRIS lamp list
- Hotfix for Arc1D stats annotations on the QA
- Hotfix for metadata (correctly set config_independent frames when multiple configurations are being setup)
- Hotfix for rebin (speed-up and conserves flux)
- Hotfix for skysub regions GUI that used np.bool
Expand Down
4 changes: 2 additions & 2 deletions pypeit/core/wavecal/autoid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ def arc_fit_qa(waveFit,

# Stats
wave_soln_fit = waveFit.pypeitfit.eval(waveFit.pixel_fit/waveFit.xnorm)#, 'legendre',minx=fit['fmin'], maxx=fit['fmax'])
ax_fit.text(0.1*len(arc_spec), 0.90*ymin+(ymax-ymin),r'$\Delta\lambda$={:.3f}$\AA$ (per pix)'.format(waveFit.cen_disp), size='small')
ax_fit.text(0.1*len(arc_spec), 0.80*ymin+(ymax-ymin),'RMS={:.3f} (pixels)'.format(waveFit.rms), size='small')
ax_fit.text(0.1, 0.9, r'$\Delta\lambda$={:.3f}$\AA$ (per pix)'.format(waveFit.cen_disp), size='small', transform=ax_fit.transAxes)
ax_fit.text(0.1, 0.8, 'RMS={:.3f} (pixels)'.format(waveFit.rms), size='small', transform=ax_fit.transAxes)
# Arc Residuals
ax_res = plt.subplot(gs[1,1])
res = waveFit.wave_fit-wave_soln_fit
Expand Down
44 changes: 22 additions & 22 deletions pypeit/spectrographs/gtc_osiris.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def default_pypeit_par(cls):
par['calibrations']['pixelflatframe']['process']['combine'] = 'median'
# Wavelength calibration methods
par['calibrations']['wavelengths']['method'] = 'full_template'
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI,ArI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI','ArI']

# Set the default exposure time ranges for the frame typing
par['scienceframe']['exprng'] = [90, None]
Expand Down Expand Up @@ -320,7 +320,7 @@ def config_specific_par(self, scifile, inp_par=None):

# Wavelength calibration and setup-dependent parameters
if self.get_meta_value(scifile, 'dispname') == 'R300B':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R300B.fits'
par['reduce']['findobj']['find_min_max'] = [750, 2051]
par['calibrations']['slitedges']['det_min_spec_length'] = 0.25
Expand All @@ -330,7 +330,7 @@ def config_specific_par(self, scifile, inp_par=None):
par['reduce']['cube']['wave_min'] = 3600.0
par['reduce']['cube']['wave_max'] = 7200.0
elif self.get_meta_value(scifile, 'dispname') == 'R300R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R300R.fits'
par['reduce']['findobj']['find_min_max'] = [750, 2051]
par['calibrations']['slitedges']['det_min_spec_length'] = 0.25
Expand All @@ -340,38 +340,38 @@ def config_specific_par(self, scifile, inp_par=None):
par['reduce']['cube']['wave_min'] = 4800.0
par['reduce']['cube']['wave_max'] = 10000.0
elif self.get_meta_value(scifile, 'dispname') == 'R500B':
par['calibrations']['wavelengths']['lamps'] = ['HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R500B.fits'
par['reduce']['findobj']['find_min_max'] = [500, 2051]
par['reduce']['cube']['wave_min'] = 3600.0
par['reduce']['cube']['wave_max'] = 7200.0
elif self.get_meta_value(scifile, 'dispname') == 'R500R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R500R.fits'
par['reduce']['findobj']['find_min_max'] = [450, 2051]
par['reduce']['cube']['wave_min'] = 4800.0
par['reduce']['cube']['wave_max'] = 10000.0
elif self.get_meta_value(scifile, 'dispname') == 'R1000B':
par['calibrations']['wavelengths']['lamps'] = ['ArI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R1000B.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R1000R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R1000R.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2000B':
par['calibrations']['wavelengths']['fwhm'] = 15.0
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2000B.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500U':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500U.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500V':
par['calibrations']['wavelengths']['lamps'] = ['HgI','NeI','XeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500V.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500R':
par['calibrations']['wavelengths']['lamps'] = ['ArI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500R.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500I':
par['calibrations']['wavelengths']['lamps'] = ['ArI,XeI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','XeI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500I.fits'
par['sensfunc']['algorithm'] = 'IR'
par['sensfunc']['IR']['telgridfile'] = "TelFit_MaunaKea_3100_26100_R20000.fits"
Expand Down Expand Up @@ -711,7 +711,7 @@ def default_pypeit_par(cls):
par['calibrations']['pixelflatframe']['process']['combine'] = 'median'
# Wavelength calibration methods
par['calibrations']['wavelengths']['method'] = 'full_template'
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI,ArI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI','ArI']

# Set the default exposure time ranges for the frame typing
par['scienceframe']['exprng'] = [90, None]
Expand Down Expand Up @@ -906,41 +906,41 @@ def config_specific_par(self, scifile, inp_par=None):

# Wavelength calibrations
if self.get_meta_value(scifile, 'dispname') == 'R300B':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R300B.fits'
par['reduce']['findobj']['find_min_max']=[750,2051]
elif self.get_meta_value(scifile, 'dispname') == 'R300R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R300R.fits'
par['reduce']['findobj']['find_min_max']=[750,2051]
elif self.get_meta_value(scifile, 'dispname') == 'R500B':
par['calibrations']['wavelengths']['lamps'] = ['HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R500B.fits'
par['reduce']['findobj']['find_min_max']=[500,2051]
elif self.get_meta_value(scifile, 'dispname') == 'R500R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R500R.fits'
par['reduce']['findobj']['find_min_max']=[450,2051]
elif self.get_meta_value(scifile, 'dispname') == 'R1000B':
par['calibrations']['wavelengths']['lamps'] = ['ArI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R1000B.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R1000R':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R1000R.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2000B':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2000B.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500U':
par['calibrations']['wavelengths']['lamps'] = ['XeI,HgI']
par['calibrations']['wavelengths']['lamps'] = ['XeI','HgI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500U.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500V':
par['calibrations']['wavelengths']['lamps'] = ['HgI','NeI','XeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500V.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500R':
par['calibrations']['wavelengths']['lamps'] = ['ArI,HgI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','HgI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500R.fits'
elif self.get_meta_value(scifile, 'dispname') == 'R2500I':
par['calibrations']['wavelengths']['lamps'] = ['ArI,XeI,NeI']
par['calibrations']['wavelengths']['lamps'] = ['ArI','XeI','NeI']
par['calibrations']['wavelengths']['reid_arxiv'] = 'gtc_osiris_R2500I.fits'
par['sensfunc']['algorithm'] = 'IR'
par['sensfunc']['IR']['telgridfile'] = "TelFit_MaunaKea_3100_26100_R20000.fits"
Expand Down

0 comments on commit e0e14a4

Please sign in to comment.