Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues with adding missing orders #1835

Merged
merged 35 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
47b9aa4
do not resync after order refinement
kbwestfall Jul 29, 2024
ffa3e02
allow to set max overlap
kbwestfall Jul 31, 2024
4850162
doc update
kbwestfall Jul 31, 2024
4722c1d
changes
kbwestfall Jul 31, 2024
505a447
Merge branch 'develop' into order_sync
kbwestfall Aug 13, 2024
e967c0c
debug overlap of added orders
kbwestfall Aug 13, 2024
04a27f0
overlap fix
kbwestfall Aug 15, 2024
eca028a
Merge branch 'develop' into order_sync
kbwestfall Aug 20, 2024
f477006
bug fix
kbwestfall Aug 20, 2024
8d17835
rm bracketing orders when there is no overlap
kbwestfall Aug 21, 2024
541f8c0
fix to build_fwhmimg
debora-pe Aug 22, 2024
00e5b30
Merge branch 'develop' into order_sync
kbwestfall Aug 26, 2024
1ada0b0
Merge branch 'develop' into order_sync
kbwestfall Aug 28, 2024
08a2798
fix overlap detection; add new parameters for order width/gap fitting
kbwestfall Aug 28, 2024
01aed2e
doc update
kbwestfall Aug 28, 2024
25c7e35
mv flexure_diagnostics into each relevant class
kbwestfall Aug 29, 2024
97c5950
small fixes
debora-pe Aug 29, 2024
449d5de
rm commented code
kbwestfall Aug 29, 2024
417c50b
Merge pull request #1845 from pypeit/flexure_diag
kbwestfall Aug 29, 2024
4ba7d1d
Merge branch 'develop' into order_sync
kbwestfall Aug 30, 2024
0665fee
doc update
kbwestfall Aug 30, 2024
1fed401
Merge branch 'develop' into order_sync
kbwestfall Aug 30, 2024
fd7707f
doc update
kbwestfall Aug 30, 2024
43a11c5
Merge branch 'develop' into order_sync
kbwestfall Sep 6, 2024
c7b710e
doc update
kbwestfall Sep 6, 2024
2bc993b
Merge branch 'develop' into order_sync
kbwestfall Sep 9, 2024
4b8ae0f
fix book-keeping bug
kbwestfall Sep 10, 2024
7a10573
order_outlier=None
debora-pe Sep 11, 2024
f875946
fix echelle waveimg bug
debora-pe Sep 17, 2024
519f53d
Merge branch 'develop' into order_sync
debora-pe Sep 17, 2024
83bbbdb
DR comments; doc update
kbwestfall Sep 17, 2024
fe64515
Merge branch 'develop' into order_sync
rcooke-ast Oct 2, 2024
e6d6117
add order prediction qa
kbwestfall Oct 28, 2024
7b33023
Merge branch 'develop' into order_sync
kbwestfall Oct 28, 2024
8323968
order qa plot
kbwestfall Oct 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions doc/api/pypeit.scripts.extract_datacube.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pypeit.scripts.extract\_datacube module
=======================================

.. automodule:: pypeit.scripts.extract_datacube
:members:
:private-members:
:undoc-members:
:show-inheritance:
1 change: 1 addition & 0 deletions doc/api/pypeit.scripts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Submodules
pypeit.scripts.compare_sky
pypeit.scripts.compile_wvarxiv
pypeit.scripts.edge_inspector
pypeit.scripts.extract_datacube
pypeit.scripts.flux_calib
pypeit.scripts.flux_setup
pypeit.scripts.identify
Expand Down
8 changes: 4 additions & 4 deletions doc/coadd3d.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ There are several recommended steps of the coadd3d process that can be run separ

pypeit_sensfunc spec1d_StandardStarName.fits -o sens_StandardStarName.fits

For further details, see :doc:`_sensitivity_function`.
For further details, see :ref:`sensitivity_function`.

#. Step 4 - Generate a datacube of the science exposures. This is done by running the following command:

Expand All @@ -164,7 +164,7 @@ There are several recommended steps of the coadd3d process that can be run separ
pypeit_coadd_datacube ScienceName.coadd3d -o

Note that you will need to specify the sensitivity function file using the ``sensfile`` option in the
:doc:`coadd3d_file` file. For further details, see :ref:`coadd3d_fluxing`.
:ref:`coadd3d_file` file. For further details, see :ref:`coadd3d_fluxing`.

Combination options
===================
Expand Down Expand Up @@ -239,7 +239,7 @@ If you would like to flux calibrate your datacube, you need to
produce your standard star datacube first. Then extract the spectrum
of the standard star using the ``pypeit_extract_datacube`` script. This
will produce a ``spec1d`` file that you will need to use to generate a
sensitivity function in the usual way (see :doc:`_sensitivity_function`).
sensitivity function in the usual way (see :ref:`sensitivity_function`).
Then, when generating the datacube of the science frame you must include
the name of the sensitivity function in your ``coadd3d`` file as follows:

Expand Down Expand Up @@ -289,7 +289,7 @@ then you can specify the ``skysub_frame`` in the ``spec2d`` block of the
above. If you have dedicated sky frames, then it is generally
recommended to reduce these frames as if they are regular science
frames, but add the following keyword arguments at the top of your
:doc:`coadd3d_file`:
:ref:`coadd3d_file`:

.. code-block:: ini

Expand Down
29 changes: 29 additions & 0 deletions doc/help/pypeit_extract_datacube.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.. code-block:: console

$ pypeit_extract_datacube -h
usage: pypeit_extract_datacube [-h] [-e EXT_FILE] [-s SAVE] [-o]
[-b BOXCAR_RADIUS] [-v VERBOSITY]
file

Read in a datacube, extract a spectrum of a point source,and save it as a spec1d
file.

positional arguments:
file spec3d.fits DataCube file

options:
-h, --help show this help message and exit
-e EXT_FILE, --ext_file EXT_FILE
Configuration file with extraction parameters (default:
None)
-s SAVE, --save SAVE Output spec1d filename (default: None)
-o, --overwrite Overwrite any existing files/directories (default:
False)
-b BOXCAR_RADIUS, --boxcar_radius BOXCAR_RADIUS
Radius of the circular boxcar (in arcseconds) to use for
the extraction. (default: None)
-v VERBOSITY, --verbosity VERBOSITY
Verbosity level between 0 [none] and 2 [all]. Default:
1. Level 2 writes a log with filename
extract_datacube_YYYYMMDD-HHMM.log (default: 1)

12 changes: 7 additions & 5 deletions doc/help/pypeit_sensfunc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@
-s SENS_FILE, --sens_file SENS_FILE
Configuration file with sensitivity function parameters
-f FLATFILE, --flatfile FLATFILE
Use the flat file for computing the sensitivity
function. Note that it is not possible to set
--flatfile and simultaneously use a .sens file with the
--sens_file option. If you are using a .sens file, set
the flatfile there via e.g.:
Use a flat calibration file to compute the blaze
function when generating the sensitivity function. This
is helpful to account for small scale undulations in the
sensitivity function. Note that it is not possible to
set --flatfile and simultaneously use a .sens file with
the --sens_file option. If you are using a .sens file,
set the flatfile there via e.g.:

[sensfunc]
flatfile = Calibrations/Flat_A_0_DET01.fits
Expand Down
1 change: 1 addition & 0 deletions doc/include/class_datamodel_pypeitimage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Attribute Type
``det_img`` `numpy.ndarray`_ `numpy.integer`_ If a detector mosaic, this image provides the detector that contributed to each pixel.
``detector`` :class:`~pypeit.images.detector_container.DetectorContainer`, :class:`~pypeit.images.mosaic.Mosaic` The detector (see :class:`~pypeit.images.detector_container.DetectorContainer`) or mosaic (see :class:`~pypeit.images.mosaic.Mosaic`) parameters
``exptime`` int, float Effective exposure time (s)
``filename`` str Filename for the image
``fullmask`` :class:`~pypeit.images.imagebitmask.ImageBitMaskArray` Image mask
``image`` `numpy.ndarray`_ `numpy.floating`_ Primary image data
``img_scale`` `numpy.ndarray`_ `numpy.floating`_ Image count scaling applied (e.g., 1/flat-field)
Expand Down
10 changes: 5 additions & 5 deletions doc/include/keck_deimos.sorted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
filename | frametype | ra | dec | target | dispname | decker | binning | mjd | airmass | exptime | dispangle | amp | filter1 | lampstat01 | dateobs | utc | frameno | calib
DE.20170527.06713.fits | arc,tilt | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.077631 | 1.41291034 | 1.0 | 8099.98291016 | SINGLE:B | OG550 | Kr Xe Ar Ne | 2017-05-27 | 01:51:53.87 | 30 | 0
d0527_0030.fits.gz | arc,tilt | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.077631 | 1.41291034 | 1.0 | 8099.98291016 | SINGLE:B | OG550 | Kr Xe Ar Ne | 2017-05-27 | 01:51:53.87 | 30 | 0
DE.20170527.06790.fits | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.07851 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:53:10.93 | 31 | 0
d0527_0031.fits.gz | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.07851 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:53:10.93 | 31 | 0
d0527_0032.fits.gz | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.079356 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:54:24.03 | 32 | 0
DE.20170527.06790.fits | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.07851 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:53:10.93 | 31 | 0
DE.20170527.06864.fits | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.079356 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:54:24.03 | 32 | 0
DE.20170527.06936.fits | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.080211 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:55:36.93 | 33 | 0
d0527_0032.fits.gz | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.079356 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:54:24.03 | 32 | 0
d0527_0033.fits.gz | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.080211 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:55:36.93 | 33 | 0
DE.20170527.06936.fits | pixelflat,illumflat,trace | 57.99999999999999 | 45.0 | DOME PHLAT | 830G | LongMirr | 1,1 | 57900.080211 | 1.41291034 | 4.0 | 8099.98291016 | SINGLE:B | OG550 | Qz | 2017-05-27 | 01:55:36.93 | 33 | 0
DE.20170527.37601.fits | science | 261.0363749999999 | 19.028166666666667 | P261_OFF | 830G | LongMirr | 1,1 | 57900.435131 | 1.03078874 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 10:26:41.61 | 80 | 0
DE.20170527.38872.fits | science | 261.0363749999999 | 19.028166666666667 | P261_OFF | 830G | LongMirr | 1,1 | 57900.449842 | 1.01267696 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 10:47:52.92 | 81 | 0
d0527_0081.fits.gz | science | 261.0363749999999 | 19.028166666666667 | P261_OFF | 830G | LongMirr | 1,1 | 57900.449842 | 1.01267696 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 10:47:52.92 | 81 | 0
d0527_0083.fits.gz | science | 261.0362916666666 | 19.028888888888886 | P261_OFF | 830G | LongMirr | 1,1 | 57900.483427 | 1.00093023 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 11:36:15.35 | 83 | 0
DE.20170527.38872.fits | science | 261.0363749999999 | 19.028166666666667 | P261_OFF | 830G | LongMirr | 1,1 | 57900.449842 | 1.01267696 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 10:47:52.92 | 81 | 0
DE.20170527.41775.fits | science | 261.0362916666666 | 19.028888888888886 | P261_OFF | 830G | LongMirr | 1,1 | 57900.483427 | 1.00093023 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 11:36:15.35 | 83 | 0
d0527_0083.fits.gz | science | 261.0362916666666 | 19.028888888888886 | P261_OFF | 830G | LongMirr | 1,1 | 57900.483427 | 1.00093023 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 11:36:15.35 | 83 | 0
DE.20170527.43045.fits | science | 261.0362916666666 | 19.028888888888886 | P261_OFF | 830G | LongMirr | 1,1 | 57900.498135 | 1.00838805 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 11:57:25.35 | 84 | 0
DE.20170527.44316.fits | science | 261.0362916666666 | 19.028888888888886 | P261_OFF | 830G | LongMirr | 1,1 | 57900.512854 | 1.02377681 | 1200.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 12:18:36.71 | 85 | 0
DE.20170527.53184.fits | science | 349.99316666666664 | -5.16575 | Feige 110 | 830G | LongMirr | 1,1 | 57900.615484 | 1.42505162 | 45.0 | 8099.98291016 | SINGLE:B | OG550 | Off | 2017-05-27 | 14:46:24.88 | 93 | 0
Expand Down
Loading
Loading