From da76488edbf7a40532de604e8b79db845bf806d7 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 10:40:07 -0400 Subject: [PATCH 1/8] CCD-1360 added rmap for miri_ipc.rmap --- crds/jwst/specs/miri_ipc.rmap | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 crds/jwst/specs/miri_ipc.rmap diff --git a/crds/jwst/specs/miri_ipc.rmap b/crds/jwst/specs/miri_ipc.rmap new file mode 100644 index 000000000..448a411ae --- /dev/null +++ b/crds/jwst/specs/miri_ipc.rmap @@ -0,0 +1,17 @@ +header = { + 'derived_from' : 'generated as stub rmap on 2014-03-24 15:03:30.015471', + 'file_ext' : '.fits', + 'filekind' : 'IPC', + 'filetype' : 'INTERPIXEL CAPACITANCE', + 'instrument' : 'MIRI', + 'mapping' : 'REFERENCE', + 'name' : 'miri_ipc.rmap', + 'observatory' : 'JWST', + 'parkey' : (('META.INSTRUMENT.DETECTOR',),), + 'sha1sum' : '02e9c784a6c48a9c1a6952fb68a9b0d35fc2f28e', + 'suffix' : 'ipc', + 'text_descr' : 'Interpixel Capacitance', +} + +selector = Match({ +}) From 6d81a0f1fd7f9fdb2baf5c4cdd74133dd5ba9723 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 10:48:09 -0400 Subject: [PATCH 2/8] CCD-1360 added rmap for miri_ipc.rmap --- CHANGES.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a67b66ccb..0d9862ca2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,12 @@ -11.17.5 (2023-08-31) + +11.17.5 (2023-09-07) ===================== JWST ---- - Added new rmap nirspec outlier detection [#950] +- Added new rmap miri Interpixel Capacitance [#951] 11.17.4 (2023-08-28) ===================== From 187d491abb85906da1108681e0841bb3b8fa3193 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 10:49:42 -0400 Subject: [PATCH 3/8] CCD-1360 added rmap for miri_ipc.rmap --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0d9862ca2..4746ee335 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,7 @@ JWST ---- - Added new rmap nirspec outlier detection [#950] -- Added new rmap miri Interpixel Capacitance [#951] +- Added new rmap miri Interpixel Capacitance [#954] 11.17.4 (2023-08-28) ===================== From 1fc9032efaf4d859af02607ac85ef81e9ad67045 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 11:09:20 -0400 Subject: [PATCH 4/8] CCD-1361 Added CHANNEL to miri_apcorr.rmap parkeys. --- crds/jwst/specs/combined_specs.json | 34 ++--------------------------- crds/jwst/specs/miri_apcorr.rmap | 4 ++-- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index c0222c79f..35e0ddd59 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -902,36 +902,6 @@ "tpn":"miri_amplifier.tpn", "unique_rowkeys":null }, - "apcorr":{ - "classes":[ - "Match", - "UseAfter" - ], - "derived_from":"Hand made 2020-01-13", - "extra_keys":null, - "file_ext":".fits", - "filekind":"APCORR", - "filetype":"APCORR", - "instrument":"MIRI", - "ld_tpn":"miri_apcorr_ld.tpn", - "mapping":"REFERENCE", - "name":"jwst_miri_apcorr.rmap", - "observatory":"JWST", - "parkey":[ - [ - "META.EXPOSURE.TYPE" - ], - [ - "META.OBSERVATION.DATE", - "META.OBSERVATION.TIME" - ] - ], - "sha1sum":"e2255db2e45b01b85aa4686d6e1811ad77ff33b8", - "suffix":"apcorr", - "text_descr":"Aperture Correction", - "tpn":"miri_apcorr.tpn", - "unique_rowkeys":null - }, "area":{ "derived_from":"Hand made 2015-09-02 16:35:00", "extra_keys":null, @@ -1232,14 +1202,14 @@ "instrument":"MIRI", "ld_tpn":"miri_ipc_ld.tpn", "mapping":"REFERENCE", - "name":"jwst_miri_ipc_0000.rmap", + "name":"miri_ipc.rmap", "observatory":"JWST", "parkey":[ [ "META.INSTRUMENT.DETECTOR" ] ], - "sha1sum":"0f07718e051396c851bbaa03a917487abec80843", + "sha1sum":"02e9c784a6c48a9c1a6952fb68a9b0d35fc2f28e", "suffix":"ipc", "text_descr":"Interpixel Capacitance", "tpn":"miri_ipc.tpn", diff --git a/crds/jwst/specs/miri_apcorr.rmap b/crds/jwst/specs/miri_apcorr.rmap index d8f91939b..d5725e81f 100644 --- a/crds/jwst/specs/miri_apcorr.rmap +++ b/crds/jwst/specs/miri_apcorr.rmap @@ -8,8 +8,8 @@ header = { 'mapping' : 'REFERENCE', 'name' : 'jwst_miri_apcorr.rmap', 'observatory' : 'JWST', - 'parkey' : (('META.EXPOSURE.TYPE',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), - 'sha1sum' : 'e2255db2e45b01b85aa4686d6e1811ad77ff33b8', + 'parkey' : (('META.EXPOSURE.TYPE', 'META.INSTRUMENT.CHANNEL'), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : 'b18a61dfb7808fae468739cdbe743da848eb443d', 'suffix' : 'apcorr', 'text_descr' : 'Aperture Correction', } From 6d7c936c8a0280de6c59249ce02d7dc7742c2e37 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 11:15:20 -0400 Subject: [PATCH 5/8] CCD-1361 Added CHANNEL to miri_apcorr.rmap parkeys. --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4746ee335..0a0b0f8c6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ JWST - Added new rmap nirspec outlier detection [#950] - Added new rmap miri Interpixel Capacitance [#954] +- Added CHANNEL to parkeys for miri_apcorr.rmap [#955] 11.17.4 (2023-08-28) ===================== From c2d68e255eb956e1d265a1a20794efd6bb408900 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 12:09:18 -0400 Subject: [PATCH 6/8] CCD-1362 Added new rmap for niriss charge migrationstep. --- CHANGES.rst | 1 + crds/jwst/specs/combined_specs.json | 31 +++++++++++++++++++ .../niriss_pars-chargemigrationstep.rmap | 17 ++++++++++ 3 files changed, 49 insertions(+) create mode 100644 crds/jwst/specs/niriss_pars-chargemigrationstep.rmap diff --git a/CHANGES.rst b/CHANGES.rst index 0a0b0f8c6..9bc5afb17 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,7 @@ JWST - Added new rmap nirspec outlier detection [#950] - Added new rmap miri Interpixel Capacitance [#954] - Added CHANNEL to parkeys for miri_apcorr.rmap [#955] +- Added new rmap niriss charge_migration step [#956] 11.17.4 (2023-08-28) ===================== diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index 35e0ddd59..49c3fcfd6 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -902,6 +902,37 @@ "tpn":"miri_amplifier.tpn", "unique_rowkeys":null }, + "apcorr":{ + "classes":[ + "Match", + "UseAfter" + ], + "derived_from":"Hand made 2020-01-13", + "extra_keys":null, + "file_ext":".fits", + "filekind":"APCORR", + "filetype":"APCORR", + "instrument":"MIRI", + "ld_tpn":"miri_apcorr_ld.tpn", + "mapping":"REFERENCE", + "name":"jwst_miri_apcorr.rmap", + "observatory":"JWST", + "parkey":[ + [ + "META.EXPOSURE.TYPE", + "META.INSTRUMENT.CHANNEL" + ], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"b18a61dfb7808fae468739cdbe743da848eb443d", + "suffix":"apcorr", + "text_descr":"Aperture Correction", + "tpn":"miri_apcorr.tpn", + "unique_rowkeys":null + }, "area":{ "derived_from":"Hand made 2015-09-02 16:35:00", "extra_keys":null, diff --git a/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap b/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap new file mode 100644 index 000000000..2ef933f68 --- /dev/null +++ b/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap @@ -0,0 +1,17 @@ +header = { + 'derived_from' : 'Derived from niriss_pars-jumpstep 2023-09-07', + 'file_ext' : '.asdf', + 'filekind' : 'pars-chargemigrationstep', + 'filetype' : 'pars-chargemigrationstep', + 'instrument' : 'NIRISS', + 'mapping' : 'REFERENCE', + 'name' : 'jwst_niriss_pars-chargemigrationstep.rmap', + 'observatory' : 'JWST', + 'parkey' : (('META.INSTRUMENT.EXP_TYPE', 'META.INSTRUMENT.FILTER', 'META.INSTRUMENT.PUPIL'),), + 'sha1sum' : '29c1ce44d948323b0d5767bf61b05bf99682515a', + 'suffix' : 'pars-chargemigrationstep', + 'text_descr' : 'Parameters to correct charge migration and the jump detection step interaction.', +} + +selector = Match({ +}) From ad00a54cd3c3719340d8367b3a0456f5c424d796 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 14:24:36 -0400 Subject: [PATCH 7/8] CCD-1362 fixed issues with niriss_pars-chargemigrationstep --- crds/jwst/specs/combined_specs.json | 28 +++++++++++++++++++ .../niriss_pars-chargemigrationstep.rmap | 6 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/crds/jwst/specs/combined_specs.json b/crds/jwst/specs/combined_specs.json index 49c3fcfd6..24d6a2c93 100644 --- a/crds/jwst/specs/combined_specs.json +++ b/crds/jwst/specs/combined_specs.json @@ -5163,6 +5163,34 @@ "tpn":"niriss_mask.tpn", "unique_rowkeys":null }, + "pars-chargemigrationstep":{ + "derived_from":"Derived from niriss_pars-jumpstep 2023-09-07", + "extra_keys":null, + "file_ext":".asdf", + "filekind":"pars-chargemigrationstep", + "filetype":"pars-chargemigrationstep", + "instrument":"NIRISS", + "ld_tpn":"niriss_pars-chargemigrationstep_ld.tpn", + "mapping":"REFERENCE", + "name":"niriss_pars-chargemigrationstep.rmap", + "observatory":"JWST", + "parkey":[ + [ + "META.INSTRUMENT.EXP_TYPE", + "META.INSTRUMENT.FILTER", + "META.INSTRUMENT.PUPIL" + ], + [ + "META.OBSERVATION.DATE", + "META.OBSERVATION.TIME" + ] + ], + "sha1sum":"5b4eef86c56f5ede23d1010734b3a12cbbdf0e47", + "suffix":"pars-chargemigrationstep", + "text_descr":"Parameters to correct charge migration and the jump detection step interaction.", + "tpn":"niriss_pars-chargemigrationstep.tpn", + "unique_rowkeys":null + }, "pars-darkpipeline":{ "classes":[ "Match", diff --git a/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap b/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap index 2ef933f68..5bc3d4069 100644 --- a/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap +++ b/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap @@ -5,10 +5,10 @@ header = { 'filetype' : 'pars-chargemigrationstep', 'instrument' : 'NIRISS', 'mapping' : 'REFERENCE', - 'name' : 'jwst_niriss_pars-chargemigrationstep.rmap', + 'name' : 'niriss_pars-chargemigrationstep.rmap', 'observatory' : 'JWST', - 'parkey' : (('META.INSTRUMENT.EXP_TYPE', 'META.INSTRUMENT.FILTER', 'META.INSTRUMENT.PUPIL'),), - 'sha1sum' : '29c1ce44d948323b0d5767bf61b05bf99682515a', + 'parkey' : (('META.INSTRUMENT.EXP_TYPE', 'META.INSTRUMENT.FILTER', 'META.INSTRUMENT.PUPIL'), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')), + 'sha1sum' : '5b4eef86c56f5ede23d1010734b3a12cbbdf0e47', 'suffix' : 'pars-chargemigrationstep', 'text_descr' : 'Parameters to correct charge migration and the jump detection step interaction.', } From 8efe9d349c271e1dbac45dc59280019192be8885 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 7 Sep 2023 15:29:43 -0400 Subject: [PATCH 8/8] CCD-1362 Fixed doctest. --- crds/tests/test_reftypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crds/tests/test_reftypes.py b/crds/tests/test_reftypes.py index 770f795ab..c8ca65b0b 100644 --- a/crds/tests/test_reftypes.py +++ b/crds/tests/test_reftypes.py @@ -221,7 +221,7 @@ def reftypes_jwst_get_filekinds(): >>> old_state = test_config.setup() >>> types = reftypes.get_types_object("jwst") >>> types.get_filekinds("niriss") - ['abvegaoffset', 'all', 'amplifier', 'apcorr', 'area', 'dark', 'distortion', 'drizpars', 'extract1d', 'filteroffset', 'flat', 'gain', 'ipc', 'linearity', 'mask', 'pars-darkpipeline', 'pars-detector1pipeline', 'pars-image2pipeline', 'pars-jumpstep', 'pars-outlierdetectionstep', 'pars-rampfitstep', 'pars-sourcecatalogstep', 'pars-spec2pipeline', 'pars-tweakregstep', 'pars-undersamplecorrectionstep', 'pathloss', 'persat', 'photom', 'readnoise', 'regions', 'saturation', 'speckernel', 'specprofile', 'spectrace', 'specwcs', 'superbias', 'throughput', 'trapdensity', 'trappars', 'wavelengthrange', 'wavemap', 'wcsregions', 'wfssbkg'] + ['abvegaoffset', 'all', 'amplifier', 'apcorr', 'area', 'dark', 'distortion', 'drizpars', 'extract1d', 'filteroffset', 'flat', 'gain', 'ipc', 'linearity', 'mask', 'pars-chargemigrationstep', 'pars-darkpipeline', 'pars-detector1pipeline', 'pars-image2pipeline', 'pars-jumpstep', 'pars-outlierdetectionstep', 'pars-rampfitstep', 'pars-sourcecatalogstep', 'pars-spec2pipeline', 'pars-tweakregstep', 'pars-undersamplecorrectionstep', 'pathloss', 'persat', 'photom', 'readnoise', 'regions', 'saturation', 'speckernel', 'specprofile', 'spectrace', 'specwcs', 'superbias', 'throughput', 'trapdensity', 'trappars', 'wavelengthrange', 'wavemap', 'wcsregions', 'wfssbkg'] >>> test_config.cleanup(old_state) """