From 378aa9ec881d194051def69babb5dc1c5e9d52c7 Mon Sep 17 00:00:00 2001 From: Howard Bushouse Date: Wed, 28 Feb 2024 17:56:05 -0500 Subject: [PATCH 1/4] add change log entry --- CHANGES.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3891b6ba..bf2e69fd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,6 +25,10 @@ Other options to ``DarkModel`` and ``MIRIDarkModel``. Add the array extension to the ``RampModel``, for tracking the average dark current. [#265] +- Add new JWST keywords ``EXTRXSTR``, ``EXTRXSTP``, ``EXTRYSTR``, and ``EXTRYSTP`` + to the ``MultiSpecModel`` schema for extracted 1-D spectra. [#264] + + 1.9.1 (2024-01-25) ================== From 9eaec6df9ac2f675347cc03cf7c2616fc1a1b8f5 Mon Sep 17 00:00:00 2001 From: Howard Bushouse Date: Wed, 28 Feb 2024 20:09:19 -0500 Subject: [PATCH 2/4] Revert "add change log entry" This reverts commit 378aa9ec881d194051def69babb5dc1c5e9d52c7. --- CHANGES.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index bf2e69fd..3891b6ba 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,10 +25,6 @@ Other options to ``DarkModel`` and ``MIRIDarkModel``. Add the array extension to the ``RampModel``, for tracking the average dark current. [#265] -- Add new JWST keywords ``EXTRXSTR``, ``EXTRXSTP``, ``EXTRYSTR``, and ``EXTRYSTP`` - to the ``MultiSpecModel`` schema for extracted 1-D spectra. [#264] - - 1.9.1 (2024-01-25) ================== From a9bb4ee003a2a7723a473b7aa1c5f96bc11466e8 Mon Sep 17 00:00:00 2001 From: Howard Bushouse Date: Wed, 28 Feb 2024 20:13:37 -0500 Subject: [PATCH 3/4] reinstate model schema changes --- .../datamodels/schemas/multispec.schema.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml index 733e1d9a..b8904788 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml @@ -84,6 +84,26 @@ allOf: type: number fits_keyword: EXTR_Y fits_hdu: EXTRACT1D + extraction_xstart: + title: X axis start of extraction region + type: number + fits_keyword: EXTRXSTR + fits_hdu: EXTRACT1D + extraction_xstop: + title: X axis end of extraction region + type: number + fits_keyword: EXTRXSTP + fits_hdu: EXTRACT1D + extraction_ystart: + title: Y axis start of extraction region + type: number + fits_keyword: EXTRYSTR + fits_hdu: EXTRACT1D + extraction_ystop: + title: Y axis end of extraction region + type: number + fits_keyword: EXTRYSTP + fits_hdu: EXTRACT1D shutter_state: title: All (open and close) shutters in a slit type: string From bb886a7b97b19f72a9e0275a391fe7ce2c646a5e Mon Sep 17 00:00:00 2001 From: Howard Bushouse Date: Wed, 28 Feb 2024 20:16:00 -0500 Subject: [PATCH 4/4] add change log entry (again) --- CHANGES.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3891b6ba..cada852f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,6 +25,10 @@ Other options to ``DarkModel`` and ``MIRIDarkModel``. Add the array extension to the ``RampModel``, for tracking the average dark current. [#265] +- Add ``EXTRXSTR``, ``EXTRXSTP``, ``EXTRYSTR``, and ``EXTRYSTP`` keywords + to the jwst ``MultiSpec`` schema. [#264] + + 1.9.1 (2024-01-25) ==================