Skip to content

Commit

Permalink
Merge pull request #1038 from spacetelescope/CCD-1453
Browse files Browse the repository at this point in the history
Added several pars-resamplestep/specstep rmaps
  • Loading branch information
hbrown-ST authored May 9, 2024
2 parents cb89483 + a1cf618 commit 26dd191
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 17 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
11.17.22 (Unreleased)
=====================

JWST
----
- Added several RMAPS for pars-resamplestep/specstep [#1038]


11.17.21 (2024-04-30)
=====================

Expand Down
88 changes: 78 additions & 10 deletions crds/jwst/specs/combined_specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2781,17 +2781,15 @@
"name":"jwst_miri_pars-resamplespecstep.rmap",
"observatory":"JWST",
"parkey":[
[
"META.EXPOSURE.TYPE"
],
[],
[
"META.OBSERVATION.DATE",
"META.OBSERVATION.TIME"
]
],
"sha1sum":"5063d08df063bac56a34f7b2afe1a3852a2f7888",
"sha1sum":"5f3c9217c940f9e32dc3e660d55fd9dd2c46007b",
"suffix":"pars-resamplespecstep",
"text_descr":"ResampleSpecStep runtime parameters",
"text_descr":"MIRI default parameters for the resample spec step.",
"tpn":"miri_pars-resamplespecstep.tpn",
"unique_rowkeys":null
},
Expand All @@ -2807,17 +2805,15 @@
"name":"jwst_miri_pars-resamplestep.rmap",
"observatory":"JWST",
"parkey":[
[
"META.EXPOSURE.TYPE"
],
[],
[
"META.OBSERVATION.DATE",
"META.OBSERVATION.TIME"
]
],
"sha1sum":"a4495c33ceca44576adc8f515bea4f02f812a97b",
"sha1sum":"aff536ad269300413ae1fca106b62e8ac48cb1f6",
"suffix":"pars-resamplestep",
"text_descr":"ResampleStep runtime parameters",
"text_descr":"MIRI default parameters for the resample step.",
"tpn":"miri_pars-resamplestep.tpn",
"unique_rowkeys":null
},
Expand Down Expand Up @@ -4430,6 +4426,30 @@
"tpn":"nircam_pars-rampfitstep.tpn",
"unique_rowkeys":null
},
"pars-resamplestep":{
"derived_from":"nircam_pars-jumpstep.rmap",
"extra_keys":null,
"file_ext":".asdf",
"filekind":"pars-resamplestep",
"filetype":"pars-resamplestep",
"instrument":"NIRCAM",
"ld_tpn":"nircam_pars-resamplestep_ld.tpn",
"mapping":"REFERENCE",
"name":"jwst_nircam_pars-resamplestep.rmap",
"observatory":"JWST",
"parkey":[
[],
[
"META.OBSERVATION.DATE",
"META.OBSERVATION.TIME"
]
],
"sha1sum":"b028106d043ef8319186b466ce64562f3a6e475f",
"suffix":"pars-resamplestep",
"text_descr":"NIRCam default parameters for the resample step.",
"tpn":"nircam_pars-resamplestep.tpn",
"unique_rowkeys":null
},
"pars-sourcecatalogstep":{
"derived_from":"Copied from miri_pars-sourcecatalogstep.rmap",
"extra_keys":null,
Expand Down Expand Up @@ -5492,6 +5512,30 @@
"tpn":"niriss_pars-rampfitstep.tpn",
"unique_rowkeys":null
},
"pars-resamplestep":{
"derived_from":"Derived from niriss_pars-rampfitstep.rmap",
"extra_keys":null,
"file_ext":".asdf",
"filekind":"pars-resamplestep",
"filetype":"pars-resamplestep",
"instrument":"NIRISS",
"ld_tpn":"niriss_pars-resamplestep_ld.tpn",
"mapping":"REFERENCE",
"name":"jwst_niriss_pars-resamplestep.rmap",
"observatory":"JWST",
"parkey":[
[],
[
"META.OBSERVATION.DATE",
"META.OBSERVATION.TIME"
]
],
"sha1sum":"00413102bbf24e8540b68543ba060d4b17d0059a",
"suffix":"pars-resamplestep",
"text_descr":"NIRISS default parameters for the resample step.",
"tpn":"niriss_pars-resamplestep.tpn",
"unique_rowkeys":null
},
"pars-sourcecatalogstep":{
"derived_from":"Copied from miri_pars-sourcecatalogstep.rmap",
"extra_keys":null,
Expand Down Expand Up @@ -7035,6 +7079,30 @@
"tpn":"nirspec_pars-rampfitstep.tpn",
"unique_rowkeys":null
},
"pars-resamplespecstep":{
"derived_from":"nirspec-pars-jumpstep.rmap",
"extra_keys":null,
"file_ext":".asdf",
"filekind":"pars-resamplespecstep",
"filetype":"pars-resamplespecstep",
"instrument":"NIRSPEC",
"ld_tpn":"nirspec_pars-resamplespecstep_ld.tpn",
"mapping":"REFERENCE",
"name":"jwst_nirspec_pars-resamplespecstep.rmap",
"observatory":"JWST",
"parkey":[
[],
[
"META.OBSERVATION.DATE",
"META.OBSERVATION.TIME"
]
],
"sha1sum":"7be1c2c08f86d134e3136840c00a9f3268c78417",
"suffix":"pars-resamplespecstep",
"text_descr":"NIRSpec Baseline parameters for resampling",
"tpn":"nirspec_pars-resamplespecstep.tpn",
"unique_rowkeys":null
},
"pars-spec2pipeline":{
"derived_from":"Hand made 2020-06-19",
"extra_keys":null,
Expand Down
6 changes: 3 additions & 3 deletions crds/jwst/specs/miri_pars-resamplespecstep.rmap
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ header = {
'mapping' : 'REFERENCE',
'name' : 'jwst_miri_pars-resamplespecstep.rmap',
'observatory' : 'JWST',
'parkey' : (('META.EXPOSURE.TYPE',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : '5063d08df063bac56a34f7b2afe1a3852a2f7888',
'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : '5f3c9217c940f9e32dc3e660d55fd9dd2c46007b',
'suffix' : 'pars-resamplespecstep',
'text_descr' : 'ResampleSpecStep runtime parameters',
'text_descr' : 'MIRI default parameters for the resample spec step.',
}

selector = Match({
Expand Down
6 changes: 3 additions & 3 deletions crds/jwst/specs/miri_pars-resamplestep.rmap
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ header = {
'mapping' : 'REFERENCE',
'name' : 'jwst_miri_pars-resamplestep.rmap',
'observatory' : 'JWST',
'parkey' : (('META.EXPOSURE.TYPE',), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : 'a4495c33ceca44576adc8f515bea4f02f812a97b',
'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : 'aff536ad269300413ae1fca106b62e8ac48cb1f6',
'suffix' : 'pars-resamplestep',
'text_descr' : 'ResampleStep runtime parameters',
'text_descr' : 'MIRI default parameters for the resample step.',
}

selector = Match({
Expand Down
17 changes: 17 additions & 0 deletions crds/jwst/specs/nircam_pars-resamplestep.rmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
header = {
'derived_from' : 'nircam_pars-jumpstep.rmap',
'file_ext' : '.asdf',
'filekind' : 'pars-resamplestep',
'filetype' : 'pars-resamplestep',
'instrument' : 'NIRCAM',
'mapping' : 'REFERENCE',
'name' : 'jwst_nircam_pars-resamplestep.rmap',
'observatory' : 'JWST',
'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : 'b028106d043ef8319186b466ce64562f3a6e475f',
'suffix' : 'pars-resamplestep',
'text_descr' : 'NIRCam default parameters for the resample step.',
}

selector = Match({
})
17 changes: 17 additions & 0 deletions crds/jwst/specs/niriss_pars-resamplestep.rmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
header = {
'derived_from' : 'Derived from niriss_pars-rampfitstep.rmap',
'file_ext' : '.asdf',
'filekind' : 'pars-resamplestep',
'filetype' : 'pars-resamplestep',
'instrument' : 'NIRISS',
'mapping' : 'REFERENCE',
'name' : 'jwst_niriss_pars-resamplestep.rmap',
'observatory' : 'JWST',
'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : '00413102bbf24e8540b68543ba060d4b17d0059a',
'suffix' : 'pars-resamplestep',
'text_descr' : 'NIRISS default parameters for the resample step.',
}

selector = Match({
})
17 changes: 17 additions & 0 deletions crds/jwst/specs/nirspec_pars-resamplespecstep.rmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
header = {
'derived_from' : 'nirspec-pars-jumpstep.rmap',
'file_ext' : '.asdf',
'filekind' : 'pars-resamplespecstep',
'filetype' : 'pars-resamplespecstep',
'instrument' : 'NIRSPEC',
'mapping' : 'REFERENCE',
'name' : 'jwst_nirspec_pars-resamplespecstep.rmap',
'observatory' : 'JWST',
'parkey' : ((), ('META.OBSERVATION.DATE', 'META.OBSERVATION.TIME')),
'sha1sum' : '7be1c2c08f86d134e3136840c00a9f3268c78417',
'suffix' : 'pars-resamplespecstep',
'text_descr' : 'NIRSpec Baseline parameters for resampling',
}

selector = Match({
})
2 changes: 1 addition & 1 deletion test/core/test_reftypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def test_reftypes_hst_get_filekinds(default_shared_state):
def test_reftypes_jwst_get_filekinds(default_shared_state):
types = reftypes.get_types_object("jwst")
niriss_types = types.get_filekinds("niriss")
expected_types = ['abvegaoffset', 'all', 'amplifier', 'apcorr', 'area', 'dark', 'distortion', 'drizpars', 'extract1d', 'filteroffset', 'flat', 'gain', 'ipc', 'linearity', 'mask', 'nrm', 'pars-chargemigrationstep', 'pars-darkpipeline', 'pars-detector1pipeline', 'pars-image2pipeline', 'pars-jumpstep', 'pars-outlierdetectionstep', 'pars-rampfitstep', 'pars-sourcecatalogstep', 'pars-spec2pipeline', 'pars-tweakregstep', 'pars-undersamplecorrectionstep', 'pars-whitelightstep', 'pathloss', 'persat', 'photom', 'readnoise', 'regions', 'saturation', 'speckernel', 'specprofile', 'spectrace', 'specwcs', 'superbias', 'throughput', 'trapdensity', 'trappars', 'wavelengthrange', 'wavemap', 'wcsregions', 'wfssbkg']
expected_types = ['abvegaoffset', 'all', 'amplifier', 'apcorr', 'area', 'dark', 'distortion', 'drizpars', 'extract1d', 'filteroffset', 'flat', 'gain', 'ipc', 'linearity', 'mask', 'nrm', 'pars-chargemigrationstep', 'pars-darkpipeline', 'pars-detector1pipeline', 'pars-image2pipeline', 'pars-jumpstep', 'pars-outlierdetectionstep', 'pars-rampfitstep', 'pars-resamplestep', 'pars-sourcecatalogstep', 'pars-spec2pipeline', 'pars-tweakregstep', 'pars-undersamplecorrectionstep', 'pars-whitelightstep', 'pathloss', 'persat', 'photom', 'readnoise', 'regions', 'saturation', 'speckernel', 'specprofile', 'spectrace', 'specwcs', 'superbias', 'throughput', 'trapdensity', 'trappars', 'wavelengthrange', 'wavemap', 'wcsregions', 'wfssbkg']
assert sorted(niriss_types) == sorted(expected_types)


Expand Down

0 comments on commit 26dd191

Please sign in to comment.