Merge pull request #956 from spacetelescope/CCD-1362

Rmap tickets for JWST build 10.0
spacetelescope · Sep 7, 2023 · da60147 · da60147
2 parents 456d62b + 8efe9d3
commit da60147
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,10 +1,14 @@
-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 [#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
@@ -919,14 +919,15 @@
             "observatory":"JWST",
             "parkey":[
                 [
-                    "META.EXPOSURE.TYPE"
+                    "META.EXPOSURE.TYPE",
+                    "META.INSTRUMENT.CHANNEL"
                 ],
                 [
                     "META.OBSERVATION.DATE",
                     "META.OBSERVATION.TIME"
                 ]
             ],
-            "sha1sum":"e2255db2e45b01b85aa4686d6e1811ad77ff33b8",
+            "sha1sum":"b18a61dfb7808fae468739cdbe743da848eb443d",
             "suffix":"apcorr",
             "text_descr":"Aperture Correction",
             "tpn":"miri_apcorr.tpn",
@@ -1232,14 +1233,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",
@@ -5162,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/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',
 }

diff --git a/crds/jwst/specs/miri_ipc.rmap 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({
+})
diff --git a/crds/jwst/specs/niriss_pars-chargemigrationstep.rmap 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' : '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.',
+}
+
+selector = Match({
+})
diff --git 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)
     """