Skip to content

Commit 588e4ee

Browse files
authored
Merge branch 'main' into jp-4265
2 parents 51e1df0 + 61bd2fe commit 588e4ee

57 files changed

Lines changed: 555 additions & 296 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

changes/10384.associations.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bypass unnecessary compare_asns calls to improve generator runtime. Factor-of-3 runtime improvement is realized for one large NRC_WFSS pool tested

docs/jwst/firstframe/api_ref.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
===
2+
API
3+
===
4+
5+
Public Step API
6+
===============
7+
8+
.. automodapi:: jwst.firstframe.firstframe_step
9+
:no-inheritance-diagram:
10+
11+
Complete Developer API
12+
======================
13+
14+
.. automodapi:: jwst.firstframe.firstframe_sub
15+
:no-inheritance-diagram:

docs/jwst/firstframe/arguments.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Step Arguments
44
The ``firstframe`` step has the following step-specific arguments.
55

66
``--bright_use_group1`` (boolean, default=True)
7-
If True, setting the group 1 groupdq to DO_NOT_USE will not be done
7+
If True, setting the group 1 ``groupdq`` to DO_NOT_USE will not be done
88
for pixels that have the saturation flag set for group 3.
99
This will allow a slope to be determined for pixels that saturate in group 3.
1010
This change in flagging will only impact pixels that saturate in group 3, the behavior
1111
for all other pixels will be unchanged.
1212
The ``bright_use_group1`` flag can be set for all data, only data/pixels that saturate
1313
in group 3 will see a difference in behavior. These pixels will be marked with
14-
the FLUX_ESTIMATED DQ flag in the pixeldq image.
14+
the FLUX_ESTIMATED DQ flag in the ``pixeldq`` image.

docs/jwst/firstframe/description.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
Description
22
===========
33

4-
:Class: `jwst.firstframe.FirstFrameStep`
4+
:Class: `jwst.firstframe.firstframe_step.FirstFrameStep`
55
:Alias: firstframe
66

7-
The ``firstframe`` step has been deprecated and will be removed
8-
in a future release. Flagging the first group has been added to the RSCD step.
7+
.. warning::
8+
The ``firstframe`` step has been deprecated and will be removed
9+
in a future release. Flagging the first group has been added to
10+
the :ref:`RSCD step <rscd_step>`.
911

1012
The MIRI first frame correction step flags the first group in every integration
1113
as bad (the "DO_NOT_USE" data quality flag is added to the GROUPDQ array), but

docs/jwst/firstframe/index.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
First Frame Correction
55
======================
66

7+
.. warning::
8+
The ``firstframe`` step has been deprecated and will be removed
9+
in a future release. Flagging the first group has been added to
10+
the :ref:`RSCD step <rscd_step>`.
11+
712
.. toctree::
813
:maxdepth: 2
914

1015
description.rst
1116
arguments.rst
12-
13-
.. automodapi:: jwst.firstframe
17+
api_ref.rst

docs/jwst/flatfield/api_ref.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
===
2+
API
3+
===
4+
5+
Public Step API
6+
===============
7+
8+
.. automodapi:: jwst.flatfield.flat_field_step
9+
:no-inheritance-diagram:
10+
11+
Complete Developer API
12+
======================
13+
14+
.. automodapi:: jwst.flatfield.flat_field
15+
:no-inheritance-diagram:

docs/jwst/flatfield/index.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Flatfield Correction
77
:maxdepth: 2
88

99
main.rst
10-
reference_files.rst
1110
arguments.rst
12-
13-
.. automodapi:: jwst.flatfield
11+
reference_files.rst
12+
api_ref.rst

docs/jwst/flatfield/main.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Description
22
===========
33

4-
:Class: `jwst.flatfield.FlatFieldStep`
4+
:Class: `jwst.flatfield.flat_field_step.FlatFieldStep`
55
:Alias: flat_field
66

77
At its basic level this step flat-fields an input science dataset by dividing
@@ -17,7 +17,7 @@ to "COMPLETE" in the output science data.
1717

1818
Imaging and Non-NIRSpec Spectroscopic Data
1919
------------------------------------------
20-
Simple imaging data, usually in the form of an ImageModel, and some
20+
Simple imaging data, usually in the form of an `~stdatamodels.jwst.datamodels.ImageModel`, and some
2121
spectroscopic modes, use a straight-forward approach that involves applying
2222
a single flat-field reference file to the science image. The spectroscopic
2323
modes included in this category are NIRCam WFSS and Time-Series Grism,
@@ -75,7 +75,7 @@ that is divided into the SCI and ERR arrays is constructed on-the-fly
7575
by extracting the relevant section from the reference files, and then --
7676
for each pixel -- interpolating to the appropriate wavelength for that
7777
pixel. This interpolation requires knowledge of the dispersion direction,
78-
which is read from keyword "DISPAXIS." See the Reference File section for
78+
which is read from keyword "DISPAXIS." See :ref:`flat_ref_nirspec_spec` for
7979
further details.
8080

8181
For NIRSpec Fixed Slit (FS) and MOS exposures, an on-the-fly flat-field is
@@ -84,8 +84,8 @@ exposure. For NIRSpec IFU exposures, a single full-frame flat-field is
8484
constructed, which is applied to the entire science image.
8585

8686
NIRSpec NRS_BRIGHTOBJ data are processed just like NIRSpec fixed slit
87-
data, except that NRS_BRIGHTOBJ data are stored in a CubeModel,
88-
rather than a MultiSlitModel. A 2-D flat-field image is constructed
87+
data, except that NRS_BRIGHTOBJ data are stored in a `~stdatamodels.jwst.datamodels.CubeModel`,
88+
rather than a `~stdatamodels.jwst.datamodels.MultiSlitModel`. A 2-D flat-field image is constructed
8989
on-the-fly as usual, but this image is then divided into each plane of
9090
the 3-D science data arrays.
9191

docs/jwst/flatfield/reference_files.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ spectroscopic exposures use the three reference files :ref:`fflat_reffile` (fore
77

88
.. include:: ../references_general/flat_reffile.inc
99

10+
.. _flat_ref_nirspec_spec:
11+
1012
Reference Files for NIRSpec Spectroscopy
1113
========================================
1214
For NIRSpec spectroscopic data, the flat-field reference files allow for variations in
1315
the flat field with wavelength, as well as from pixel to pixel. There is a
1416
separate flat-field reference file for each of three sections of the
15-
instrument: the fore optics (FFLAT), the spectrograph (SFLAT), and the
16-
detector (DFLAT). The contents of the reference files differ from one mode
17+
instrument:
18+
19+
* the fore optics (:ref:`fflat_reffile`)
20+
* the spectrograph (:ref:`sflat_reffile`)
21+
* the detector (:ref:`dflat_reffile`)
22+
23+
The contents of the reference files differ from one mode
1724
to another (see below), but in general they may contain a flat-field image and
1825
a 1-D array. The image provides pixel-to-pixel values for the flat field
1926
that may vary slowly (or not at all) with wavelength, while the 1-D array
@@ -45,8 +52,8 @@ there are different flat fields for fixed-slit data, IFU data, and for
4552
multi-object spectroscopic data. Here is a summary of the contents of these
4653
files.
4754

48-
For the fore optics (FFLAT), the flat field for fixed-slit data contains just a
49-
FAST_VARIATION table (i.e. there is no image). This table has five rows,
55+
For the fore optics (:ref:`fflat_reffile`), the flat field for fixed-slit data contains just a
56+
FAST_VARIATION table (i.e., there is no image). This table has five rows,
5057
one for each of the fixed slits. The FFLAT for IFU data also contains
5158
just a FAST_VARIATION table, but it has only one row with the value "ANY"
5259
in the "slit_name" column. For multi-object spectroscopic data, the FFLAT
@@ -57,22 +64,18 @@ than to detector pixels. The array size is 365 columns by 171 rows,
5764
and there are multiple planes to handle the slow variation
5865
of flat field with wavelength.
5966

60-
For the spectrograph optics (SFLAT), the flat-field files have nearly the same
67+
For the spectrograph optics (:ref:`sflat_reffile`), the flat-field files have nearly the same
6168
format for fixed-slit data, IFU, and multi-object data. The difference is
6269
that for fixed-slit and IFU data, the image is just a single plane,
63-
i.e. the only variation with wavelength is in the FAST_VARIATION table,
70+
i.e., the only variation with wavelength is in the FAST_VARIATION table,
6471
while there are multiple planes in the image for multi-object spectroscopic
6572
data (and therefore there is also a corresponding WAVELENGTH table, with
6673
one row for each plane of the image).
6774

68-
For the detector section, the DFLAT file contains a 3-D image
69-
(i.e. the flat field at multiple wavelengths), a corresponding
75+
For the detector section, the :ref:`dflat_reffile` contains a 3-D image
76+
(i.e., the flat field at multiple wavelengths), a corresponding
7077
WAVELENGTH table, and a FAST_VARIATION table with one row.
7178

72-
As just described, there are 3 types of reference files for NIRSpec (FFLAT,
73-
SFLAT, and DFLAT), and within each of these types, there are several formats,
74-
which are now described.
75-
7679
.. include:: ../references_general/fflat_reffile.inc
7780

7881
.. include:: ../references_general/sflat_reffile.inc

docs/jwst/fringe/api_ref.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
===
2+
API
3+
===
4+
5+
Public Step API
6+
===============
7+
8+
.. automodapi:: jwst.fringe.fringe_step
9+
:no-inheritance-diagram:
10+
11+
Complete Developer API
12+
======================
13+
14+
.. automodapi:: jwst.fringe.fringe
15+
:no-inheritance-diagram:

0 commit comments

Comments
 (0)