From acba76006dafc1654aabc971645d4120472e09cd Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 00:09:54 -0500 Subject: [PATCH 1/6] Added miri_psf.rmap and tpn file. Also added badpixselfcalstep for nirspec. --- crds/jwst/specs/combined_specs.json | 56 +++++++++++++++++++ crds/jwst/specs/miri_psf.rmap | 18 ++++++ .../specs/nirspec_pars-badpixselfcalstep.rmap | 17 ++++++ crds/jwst/tpns/miri_psf.tpn | 2 + 4 files changed, 93 insertions(+) create mode 100644 crds/jwst/specs/miri_psf.rmap create mode 100644 crds/jwst/specs/nirspec_pars-badpixselfcalstep.rmap create mode 100644 crds/jwst/tpns/miri_psf.tpn diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index a5e036bd1..614a79e72 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -3474,6 +3474,38 @@ "BAND" ] }, + "psf":{ + "classes":[ + "Match", + "UseAfter" + ], + "derived_from":"miri_psfmask.rmap", + "extra_keys":null, + "file_ext":".fits", + "filekind":"PSF", + "filetype":"PSF", + "instrument":"MIRI", + "ld_tpn":"miri_psf_ld.tpn", + "mapping":"REFERENCE", + "name":"jwst_miri_psf.rmap", + "observatory":"JWST", + "parkey":[ + [ + "META.INSTRUMENT.DETECTOR", + "META.INSTRUMENT.FILTER", + "META.INSTRUMENT.EXP_TYPE" + ], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"0b775db9977c34845445b989b9597d04cc8bfd2b", + "suffix":"psf", + "text_descr":"A wavelength array to be used for spectral extraction", + "tpn":"miri_psf.tpn", + "unique_rowkeys":null + }, "psfmask":{ "classes":[ "Match", @@ -7017,6 +7049,30 @@ "tpn":"nirspec_ote.tpn", "unique_rowkeys":null }, + "pars-badpixselfcalstep":{ + "derived_from":"Created by Hunter Brown 2024-10-10", + "extra_keys":null, + "file_ext":".asdf", + "filekind":"pars-badpixselfcalstep", + "filetype":"pars-badpixselfcalstep", + "instrument":"NIRSPEC", + "ld_tpn":"nirspec_pars-badpixselfcalstep_ld.tpn", + "mapping":"REFERENCE", + "name":"jwst_nirspec_pars-badpixselfcalstep.rmap", + "observatory":"JWST", + "parkey":[ + [], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"41bc0a03d084c3b31fae801972a8222e1ace36f1", + "suffix":"pars-badpixselfcalstep", + "text_descr":"Base rmap for nirspec-badpixselfcalstep", + "tpn":"nirspec_pars-badpixselfcalstep.tpn", + "unique_rowkeys":null + }, "pars-darkcurrentstep":{ "derived_from":"Created by Hunter Brown 2024-06-10", "extra_keys":null, diff --git a/crds/jwst/specs/miri_psf.rmap b/crds/jwst/specs/miri_psf.rmap new file mode 100644 index 000000000..4d195ed88 --- /dev/null +++ b/crds/jwst/specs/miri_psf.rmap @@ -0,0 +1,18 @@ +header = { + 'classes' : ('Match', 'UseAfter'), + 'derived_from' : 'miri_psfmask.rmap', + 'file_ext' : '.fits', + 'filekind' : 'PSF', + 'filetype' : 'PSF', + 'instrument' : 'MIRI', + 'mapping' : 'REFERENCE', + 'name' : 'jwst_miri_psf.rmap', + 'observatory' : 'JWST', + 'parkey' : (('META.INSTRUMENT.DETECTOR', 'META.INSTRUMENT.FILTER', 'META.INSTRUMENT.EXP_TYPE'), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : '0b775db9977c34845445b989b9597d04cc8bfd2b', + 'suffix' : 'psf', + 'text_descr' : 'A wavelength array to be used for spectral extraction', +} + +selector = Match({ +}) diff --git a/crds/jwst/specs/nirspec_pars-badpixselfcalstep.rmap b/crds/jwst/specs/nirspec_pars-badpixselfcalstep.rmap new file mode 100644 index 000000000..1d3538b58 --- /dev/null +++ b/crds/jwst/specs/nirspec_pars-badpixselfcalstep.rmap @@ -0,0 +1,17 @@ +header = { + 'derived_from' : 'Created by Hunter Brown 2024-10-10', + 'file_ext' : '.asdf', + 'filekind' : 'pars-badpixselfcalstep', + 'filetype' : 'pars-badpixselfcalstep', + 'instrument' : 'NIRSPEC', + 'mapping' : 'REFERENCE', + 'name' : 'jwst_nirspec_pars-badpixselfcalstep.rmap', + 'observatory' : 'JWST', + 'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : '41bc0a03d084c3b31fae801972a8222e1ace36f1', + 'suffix' : 'pars-badpixselfcalstep', + 'text_descr' : 'Base rmap for nirspec-badpixselfcalstep', +} + +selector = Match({ +}) diff --git a/crds/jwst/tpns/miri_psf.tpn b/crds/jwst/tpns/miri_psf.tpn new file mode 100644 index 000000000..60f6e3a60 --- /dev/null +++ b/crds/jwst/tpns/miri_psf.tpn @@ -0,0 +1,2 @@ +# Commented out until INS is ready for strict model type validation: +# META.MODEL_TYPE H S R PSFModel \ No newline at end of file From 41fcf851678c5ebff60ebaa059d24c19b9e78db5 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 01:02:41 -0500 Subject: [PATCH 2/6] Added nircam_convkernel.rmap --- crds/jwst/specs/combined_specs.json | 26 ++++++++++++++++++++++++++ crds/jwst/specs/nircam_convkernel.rmap | 17 +++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 crds/jwst/specs/nircam_convkernel.rmap diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index 614a79e72..95d17f62b 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -4055,6 +4055,32 @@ "tpn":"nircam_area.tpn", "unique_rowkeys":null }, + "convkernel":{ + "derived_from":"Handmade on 11/26/24 by Hunter Brown", + "extra_keys":null, + "file_ext":".asdf", + "filekind":"convkernel", + "filetype":"CONVKERNEL", + "instrument":"NIRCAM", + "ld_tpn":"nircam_convkernel_ld.tpn", + "mapping":"REFERENCE", + "name":"nircam_convkernel.rmap", + "observatory":"JWST", + "parkey":[ + [ + "META.INSTRUMENT.DETECTOR" + ], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"b10673bfc82d37e3564c5b9014e225c0ba90313a", + "suffix":"convkernel", + "text_descr":"Convolution kernels for NIRCam.", + "tpn":"nircam_convkernel.tpn", + "unique_rowkeys":null + }, "dark":{ "classes":[ "Match", diff --git a/crds/jwst/specs/nircam_convkernel.rmap b/crds/jwst/specs/nircam_convkernel.rmap new file mode 100644 index 000000000..688cfe1b5 --- /dev/null +++ b/crds/jwst/specs/nircam_convkernel.rmap @@ -0,0 +1,17 @@ +header = { + 'derived_from' : 'Handmade on 11/26/24 by Hunter Brown', + 'file_ext' : '.asdf', + 'filekind' : 'convkernel', + 'filetype' : 'CONVKERNEL', + 'instrument' : 'NIRCAM', + 'mapping' : 'REFERENCE', + 'name' : 'nircam_convkernel.rmap', + 'observatory' : 'JWST', + 'parkey' : (('META.INSTRUMENT.DETECTOR',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : 'b10673bfc82d37e3564c5b9014e225c0ba90313a', + 'suffix' : 'convkernel', + 'text_descr' : 'Convolution kernels for NIRCam.', +} + +selector = Match({ +}) From f9e7c6528d6b22609ffae2fd59f6e578ac2e9be7 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 01:13:51 -0500 Subject: [PATCH 3/6] Updated changelog. --- CHANGES.rst | 19 +++++++++++++++++++ changes/1098.jwst.rst | 1 - changes/1099.jwst.rst | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) delete mode 100644 changes/1098.jwst.rst create mode 100644 changes/1099.jwst.rst diff --git a/CHANGES.rst b/CHANGES.rst index e69b7680f..58bacd329 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,22 @@ +12.0.7 (2024-11-26) +============================================ + +JWST +---- + +- Added miri_psf.rmap, nircam_convkernel.rmap, and nirspec_pars-badpixselfcalstep.rmap. (`#1099 + `_) + +12.0.6 (2024-11-19) +============================================ + +JWST +---- + +- Added SUB8FP6A to nircam_all.tpn. (`#1098 + `_) + + 12.0.5 (2024-11-05) =================== diff --git a/changes/1098.jwst.rst b/changes/1098.jwst.rst deleted file mode 100644 index 955fe43df..000000000 --- a/changes/1098.jwst.rst +++ /dev/null @@ -1 +0,0 @@ -Added SUB8FP6A to nircam_all.tpn. diff --git a/changes/1099.jwst.rst b/changes/1099.jwst.rst new file mode 100644 index 000000000..df3be70d8 --- /dev/null +++ b/changes/1099.jwst.rst @@ -0,0 +1 @@ +Added miri_psf.rmap, nircam_convkernel.rmap, and nirspec_pars-badpixselfcalstep.rmap. From 02431c317e4a19449e3560feb3c87306d8a368ea Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 10:19:06 -0500 Subject: [PATCH 4/6] Updated description and parkey for nircam and miri respectively. --- CHANGES.rst | 4 ++-- changes/1100.jwst.rst | 1 + crds/jwst/specs/combined_specs.json | 8 ++++---- crds/jwst/specs/miri_psf.rmap | 4 ++-- crds/jwst/specs/nircam_convkernel.rmap | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 changes/1100.jwst.rst diff --git a/CHANGES.rst b/CHANGES.rst index 58bacd329..5883ad206 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,8 +4,8 @@ JWST ---- -- Added miri_psf.rmap, nircam_convkernel.rmap, and nirspec_pars-badpixselfcalstep.rmap. (`#1099 - `_) +- Added miri_psf.rmap, nircam_convkernel.rmap, and nirspec_pars-badpixselfcalstep.rmap. (`#1100 + `_) 12.0.6 (2024-11-19) ============================================ diff --git a/changes/1100.jwst.rst b/changes/1100.jwst.rst new file mode 100644 index 000000000..eb36f52ec --- /dev/null +++ b/changes/1100.jwst.rst @@ -0,0 +1 @@ +Updated EXPTYPE parkey in miri psf and description in Nircam convkernel diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index 95d17f62b..cab5ff1a1 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -3493,14 +3493,14 @@ [ "META.INSTRUMENT.DETECTOR", "META.INSTRUMENT.FILTER", - "META.INSTRUMENT.EXP_TYPE" + "META.EXPOSURE.TYPE" ], [ "META.OBSERVATION.DATE", "META.OBSERVATION.TIME" ] ], - "sha1sum":"0b775db9977c34845445b989b9597d04cc8bfd2b", + "sha1sum":"080c984cf3255235de5e2309ef0ef6b20a6b39e9", "suffix":"psf", "text_descr":"A wavelength array to be used for spectral extraction", "tpn":"miri_psf.tpn", @@ -4075,9 +4075,9 @@ "META.OBSERVATION.TIME" ] ], - "sha1sum":"b10673bfc82d37e3564c5b9014e225c0ba90313a", + "sha1sum":"7e68052cef44f94d28aa2f602369325c6c76995c", "suffix":"convkernel", - "text_descr":"Convolution kernels for NIRCam.", + "text_descr":"Convolution kernels for the reference pixel subtraction step.", "tpn":"nircam_convkernel.tpn", "unique_rowkeys":null }, diff --git a/crds/jwst/specs/miri_psf.rmap b/crds/jwst/specs/miri_psf.rmap index 4d195ed88..d4e982757 100644 --- a/crds/jwst/specs/miri_psf.rmap +++ b/crds/jwst/specs/miri_psf.rmap @@ -8,8 +8,8 @@ header = { 'mapping' : 'REFERENCE', 'name' : 'jwst_miri_psf.rmap', 'observatory' : 'JWST', - 'parkey' : (('META.INSTRUMENT.DETECTOR', 'META.INSTRUMENT.FILTER', 'META.INSTRUMENT.EXP_TYPE'), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), - 'sha1sum' : '0b775db9977c34845445b989b9597d04cc8bfd2b', + 'parkey' : (('META.INSTRUMENT.DETECTOR', 'META.INSTRUMENT.FILTER', 'META.EXPOSURE.TYPE'), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : '080c984cf3255235de5e2309ef0ef6b20a6b39e9', 'suffix' : 'psf', 'text_descr' : 'A wavelength array to be used for spectral extraction', } diff --git a/crds/jwst/specs/nircam_convkernel.rmap b/crds/jwst/specs/nircam_convkernel.rmap index 688cfe1b5..6a484ef66 100644 --- a/crds/jwst/specs/nircam_convkernel.rmap +++ b/crds/jwst/specs/nircam_convkernel.rmap @@ -8,9 +8,9 @@ header = { 'name' : 'nircam_convkernel.rmap', 'observatory' : 'JWST', 'parkey' : (('META.INSTRUMENT.DETECTOR',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), - 'sha1sum' : 'b10673bfc82d37e3564c5b9014e225c0ba90313a', + 'sha1sum' : '7e68052cef44f94d28aa2f602369325c6c76995c', 'suffix' : 'convkernel', - 'text_descr' : 'Convolution kernels for NIRCam.', + 'text_descr' : 'Convolution kernels for the reference pixel subtraction step.', } selector = Match({ From 77e42b024665be7362d66317be9e609703ede091 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 10:25:15 -0500 Subject: [PATCH 5/6] Updated to sirskernel from convkernel. --- crds/jwst/specs/nircam_convkernel.rmap | 17 ----------------- crds/jwst/specs/nircam_sirskernel.rmap | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 crds/jwst/specs/nircam_convkernel.rmap create mode 100644 crds/jwst/specs/nircam_sirskernel.rmap diff --git a/crds/jwst/specs/nircam_convkernel.rmap b/crds/jwst/specs/nircam_convkernel.rmap deleted file mode 100644 index 6a484ef66..000000000 --- a/crds/jwst/specs/nircam_convkernel.rmap +++ /dev/null @@ -1,17 +0,0 @@ -header = { - 'derived_from' : 'Handmade on 11/26/24 by Hunter Brown', - 'file_ext' : '.asdf', - 'filekind' : 'convkernel', - 'filetype' : 'CONVKERNEL', - 'instrument' : 'NIRCAM', - 'mapping' : 'REFERENCE', - 'name' : 'nircam_convkernel.rmap', - 'observatory' : 'JWST', - 'parkey' : (('META.INSTRUMENT.DETECTOR',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), - 'sha1sum' : '7e68052cef44f94d28aa2f602369325c6c76995c', - 'suffix' : 'convkernel', - 'text_descr' : 'Convolution kernels for the reference pixel subtraction step.', -} - -selector = Match({ -}) diff --git a/crds/jwst/specs/nircam_sirskernel.rmap b/crds/jwst/specs/nircam_sirskernel.rmap new file mode 100644 index 000000000..dc0784508 --- /dev/null +++ b/crds/jwst/specs/nircam_sirskernel.rmap @@ -0,0 +1,17 @@ +header = { + 'derived_from' : 'Handmade on 11/26/24 by Hunter Brown', + 'file_ext' : '.asdf', + 'filekind' : 'sirskernel', + 'filetype' : 'SIRSKERNEL', + 'instrument' : 'NIRCAM', + 'mapping' : 'REFERENCE', + 'name' : 'nircam_sirskernel.rmap', + 'observatory' : 'JWST', + 'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : '7e68052cef44f94d28aa2f602369325c6c76995c', + 'suffix' : 'sirskernel', + 'text_descr' : 'Convolution kernel for the Simple Improved Reference Subtraction approach.', +} + +selector = Match({ +}) From 3145d1d101c6170affc1a4c9c59f65c7b4acc32e Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 26 Nov 2024 10:32:35 -0500 Subject: [PATCH 6/6] Updated combined_specs --- crds/jwst/specs/combined_specs.json | 50 +++++++++++++------------- crds/jwst/specs/nircam_sirskernel.rmap | 2 +- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index cab5ff1a1..f81ef979f 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -4055,32 +4055,6 @@ "tpn":"nircam_area.tpn", "unique_rowkeys":null }, - "convkernel":{ - "derived_from":"Handmade on 11/26/24 by Hunter Brown", - "extra_keys":null, - "file_ext":".asdf", - "filekind":"convkernel", - "filetype":"CONVKERNEL", - "instrument":"NIRCAM", - "ld_tpn":"nircam_convkernel_ld.tpn", - "mapping":"REFERENCE", - "name":"nircam_convkernel.rmap", - "observatory":"JWST", - "parkey":[ - [ - "META.INSTRUMENT.DETECTOR" - ], - [ - "META.OBSERVATION.DATE", - "META.OBSERVATION.TIME" - ] - ], - "sha1sum":"7e68052cef44f94d28aa2f602369325c6c76995c", - "suffix":"convkernel", - "text_descr":"Convolution kernels for the reference pixel subtraction step.", - "tpn":"nircam_convkernel.tpn", - "unique_rowkeys":null - }, "dark":{ "classes":[ "Match", @@ -4816,6 +4790,30 @@ "tpn":"nircam_saturation.tpn", "unique_rowkeys":null }, + "sirskernel":{ + "derived_from":"Handmade on 11/26/24 by Hunter Brown", + "extra_keys":null, + "file_ext":".asdf", + "filekind":"sirskernel", + "filetype":"SIRSKERNEL", + "instrument":"NIRCAM", + "ld_tpn":"nircam_sirskernel_ld.tpn", + "mapping":"REFERENCE", + "name":"nircam_sirskernel.rmap", + "observatory":"JWST", + "parkey":[ + [], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"179a0f57a882ef5d8fbbeafc03a96f0280c1ce02", + "suffix":"sirskernel", + "text_descr":"Convolution kernel for the Simple Improved Reference Subtraction approach.", + "tpn":"nircam_sirskernel.tpn", + "unique_rowkeys":null + }, "specwcs":{ "classes":[ "Match", diff --git a/crds/jwst/specs/nircam_sirskernel.rmap b/crds/jwst/specs/nircam_sirskernel.rmap index dc0784508..e0d6f8cb7 100644 --- a/crds/jwst/specs/nircam_sirskernel.rmap +++ b/crds/jwst/specs/nircam_sirskernel.rmap @@ -8,7 +8,7 @@ header = { 'name' : 'nircam_sirskernel.rmap', 'observatory' : 'JWST', 'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), - 'sha1sum' : '7e68052cef44f94d28aa2f602369325c6c76995c', + 'sha1sum' : '179a0f57a882ef5d8fbbeafc03a96f0280c1ce02', 'suffix' : 'sirskernel', 'text_descr' : 'Convolution kernel for the Simple Improved Reference Subtraction approach.', }