Address (some) keyword differences #354

braingram · 2024-11-01T15:28:15Z

This PR is mostly title changes to match FITS keyword titles listed in the keyword dictionary. In addition to the title changes a few enums were updated. Most are S_XX keywords adding a [COMPLETE, SKIPPED] enum to match the keyword dictionary. I will add inline notes for the others.

See https://grit.stsci.edu/OED_DSB/jwstkd/-/merge_requests/124 for the corresponding keyword dictionary PR. In some circumstances I chose to update the title in the keyword dictionary (to fix a typo, move the unit to the front, or when the datamodel title otherwise seemed more informative).

Regression tests at https://github.com/spacetelescope/RegressionTests/actions/runs/11632952166
with a branch of jwst that ignore comment differences as the changes in this PR will introduce a LOT
spacetelescope/jwst#8940
showed only 1 unrelated failure (which also occurs on jwst main: https://github.com/spacetelescope/RegressionTests/actions/runs/11635302796/job/32404503314#step:28:101)

This does not address all of the keyword differences. Some unaddressed ones are:

keywords in datamodels but not in the keyword dictionary: Address keywords in datamodels but missing from the keyword dictionary #346
keywords in the keyword diction but not in the datamodels: Address keywords missing from datamodels #339
some keywords present in both still show differences but these all seem more complicated (requiring more reorganization of the keyword dictionary and/or adding/addressing enum differences) than the ones addressed here and this PR is already possibly too large

Tasks

update or add relevant tests
update relevant docstrings and / or docs/ page
Does this PR change any API used downstream? (if not, label with no-changelog-entry-needed)
- write news fragment(s) in changes/: echo "changed something" > changes/<PR#>.<changetype>.rst (see below for change types)
- run jwst regression tests with this branch installed ("git+https://github.com/<fork>/stdatamodels@<branch>")

news fragment change types...

changes/<PR#>.feature.rst: new feature
changes/<PR#>.bugfix.rst: fixes an issue
changes/<PR#>.doc.rst: documentation change
changes/<PR#>.removal.rst: deprecation or removal of public API
changes/<PR#>.misc.rst: infrastructure or miscellaneous change

codecov · 2024-11-01T15:30:36Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.52%. Comparing base (1e16207) to head (3420dc9).
Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #354   +/-   ##
=======================================
  Coverage   67.52%   67.52%           
=======================================
  Files         114      114           
  Lines        5916     5916           
=======================================
  Hits         3995     3995           
  Misses       1921     1921

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

braingram · 2024-11-01T20:02:43Z

src/stdatamodels/jwst/_kwtool/compare.py

+    ("PRIMARY", "FOCUSPOS"): {
+        "type": {
+            "dmd": {
+                "union": {"integer"},


FOCUSPOS for nirspec is listed as "steps" and of type "integer". For niriss and fg it's listed as "mm" and of type "float".

Adding this expected difference allows it to be listed as a "number" in the datamodel schema.

braingram · 2024-11-01T20:04:05Z

src/stdatamodels/jwst/_kwtool/compare.py

+    ("PRIMARY", "MRSPRCHN"): {
+        "enum": {
+            "dmd": {
+                "difference": {"ALL"},


I wasn't quite sure about this one but the datamodel schemas list "ALL" but the keyword dictionary does not.

braingram · 2024-11-01T20:05:44Z

src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml

            type: integer
-            enum: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]


The keyword dictionary doesn't have an "enum" for this keyword and states "Possible values are 1-10" (note the absence of 0). I chose for this PR to remove the enum.

braingram · 2024-11-01T20:08:23Z

Remaining differences (not including missing)

HDU: POINTING KEYWORD: DDCFLDPT

path

{ 'dmd': ['meta.ddc_field_point'],
  'kwd': ['meta.guidestar_ext.pointing_ddcfldpt']}

title

{ 'dmd': ['Differential Distortion Compensation field point'],
  'kwd': ['Differential Distortion Compensation field pt']}

HDU: POINTING KEYWORD: DEC_DDC

path

{'dmd': ['meta.dec_ddc'], 'kwd': ['meta.guidestar_ext.pointing_dec_ddc']}

title

{'dmd': ['[deg] Dec of DDC field point'], 'kwd': ['DEC of DDC field point']}

HDU: POINTING KEYWORD: DEC_J1

path

{'dmd': ['meta.dec_j1'], 'kwd': ['meta.guidestar_ext.pointing_dec_j1']}

title

{'dmd': ['[deg] Dec of telescope J1 axis'], 'kwd': ['DEC of telescope J1 axis']}

HDU: POINTING KEYWORD: DEC_V1

path

{'dmd': ['meta.dec_v1'], 'kwd': ['meta.guidestar_ext.pointing_dec_v1']}

title

{'dmd': ['[deg] Dec of telescope V1 axis'], 'kwd': ['DEC of telescope V1 axis']}

HDU: POINTING KEYWORD: JITTRAVG

path

{'dmd': ['meta.jitter_average'], 'kwd': ['meta.guidestar_ext.jitter_average']}

title

{ 'dmd': ['Average jitter over duration of data'],
  'kwd': ['[mas] Average jitter over duration of data']}

HDU: POINTING KEYWORD: JITTRMAX

path

{'dmd': ['meta.jitter_max'], 'kwd': ['meta.guidestar_ext.jitter_maximum']}

title

{ 'dmd': ['Maximum jitter over duration of data'],
  'kwd': ['[mas] Maximum jitter over duration of data']}

HDU: POINTING KEYWORD: JITTRMIN

path

{'dmd': ['meta.jitter_min'], 'kwd': ['meta.guidestar_ext.jitter_minimum']}

title

{ 'dmd': ['Minimum jitter over duration of data'],
  'kwd': ['[mas] Minimum jitter over duration of data']}

HDU: POINTING KEYWORD: PA_APER

path

{'dmd': ['meta.position_angle'], 'kwd': ['meta.guidestar_ext.pointing_pa_aper']}

HDU: POINTING KEYWORD: PA_J3

path

{'dmd': ['meta.pa_j3'], 'kwd': ['meta.guidestar_ext.pointing_pa_j3']}

title

{ 'dmd': ['[deg] Position angle of J3 axis at J1'],
  'kwd': ['position angle of J3 axis at J1']}

HDU: POINTING KEYWORD: PA_V3

path

{'dmd': ['meta.pa_v3'], 'kwd': ['meta.guidestar_ext.pointing_pa_v3']}

title

{ 'dmd': ['[deg] Position angle of V3 axis at V1'],
  'kwd': ['position angle of V3 axis at V1']}

HDU: POINTING KEYWORD: POINTTIM

path

{'dmd': ['meta.pointing_time'], 'kwd': ['meta.guidestar_ext.pointing_pointtim']}

HDU: POINTING KEYWORD: RA_DDC

path

{'dmd': ['meta.ra_ddc'], 'kwd': ['meta.guidestar_ext.pointing_ra_ddc']}

title

{'dmd': ['[deg] RA of DDC field point'], 'kwd': ['RA of DDC field point']}

HDU: POINTING KEYWORD: RA_J1

path

{'dmd': ['meta.ra_j1'], 'kwd': ['meta.guidestar_ext.pointing_ra_j1']}

title

{'dmd': ['[deg] RA of telescope J1 axis'], 'kwd': ['RA of telescope J1 axis']}

HDU: POINTING KEYWORD: RA_V1

path

{'dmd': ['meta.ra_v1'], 'kwd': ['meta.guidestar_ext.pointing_ra_v1']}

title

{'dmd': ['[deg] RA of telescope V1 axis'], 'kwd': ['RA of telescope V1 axis']}

HDU: PRIMARY KEYWORD: CAL_VCS

path

{ 'dmd': ['meta.calibration_software_revision'],
  'kwd': ['meta.basic.calibration_software_revision']}

title

{ 'dmd': ['Calibration software version control sys number'],
  'kwd': ['Calibration Software Repository Version']}

HDU: PRIMARY KEYWORD: CAL_VER

path

{ 'dmd': ['meta.calibration_software_version'],
  'kwd': ['meta.basic.calibration_software_version']}

HDU: PRIMARY KEYWORD: COMPRESS

path

{'dmd': ['meta.compress'], 'kwd': ['meta.basic.compress']}

HDU: PRIMARY KEYWORD: CORONMSK

enum

{ 'dmd': [ '4QPM',
           '4QPM_1065',
           '4QPM_1140',
           '4QPM_1550',
           'LYOT',
           'LYOT_2300',
           'MASK210R',
           'MASK335R',
           'MASK430R',
           'MASKA210R',
           'MASKA335R',
           'MASKA430R',
           'MASKALWB',
           'MASKASWB',
           'MASKLWB',
           'MASKSWB',
           'NONE'],
  'kwd': [ '4QPM',
           '4QPM_1065',
           '4QPM_1140',
           '4QPM_1550',
           'LYOT',
           'LYOT_2300',
           'MASKA210R',
           'MASKA335R',
           'MASKA430R',
           'MASKALWB',
           'MASKASWB']}

HDU: PRIMARY KEYWORD: DATAMODL

path

{'dmd': ['meta.model_type'], 'kwd': ['meta.basic.model_type']}

HDU: PRIMARY KEYWORD: DATE

path

{'dmd': ['meta.date'], 'kwd': ['meta.basic.date']}

HDU: PRIMARY KEYWORD: DIRIMAGE

path

{'dmd': ['meta.direct_image'], 'kwd': ['meta.resample.direct_image']}

HDU: PRIMARY KEYWORD: FILENAME

path

{'dmd': ['meta.filename'], 'kwd': ['meta.basic.filename']}

HDU: PRIMARY KEYWORD: GSC_VER

path

{ 'dmd': ['meta.guide_star_catalog_version'],
  'kwd': ['meta.basic.guide_star_catalog_version']}

HDU: PRIMARY KEYWORD: HGA_MOVE

path

{'dmd': ['meta.hga_move'], 'kwd': ['meta.basic.hga_move']}

HDU: PRIMARY KEYWORD: HGA_STOP

path

{'dmd': ['meta.hga_stop_time'], 'kwd': ['meta.basic.hga_stop_time']}

HDU: PRIMARY KEYWORD: HGA_STRT

path

{'dmd': ['meta.hga_start_time'], 'kwd': ['meta.basic.hga_start_time']}

HDU: PRIMARY KEYWORD: LAMP

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ 'BOTH',
           'FLAT1',
           'FLAT2',
           'FLAT3',
           'FLAT4',
           'FLAT5',
           'G1LAMP1',
           'G2LAMP1',
           'IFU',
           'IMG',
           'LINE1',
           'LINE2',
           'LINE3',
           'LINE4',
           'NONE',
           'OFF',
           'REF',
           'TEST']}

HDU: PRIMARY KEYWORD: MSASTATE

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ 'LAUNCHLOCK_ALLCLOSED',
           'PRIMARYPARK_ALLCLOSED',
           'PRIMARYPARK_ALLOPEN',
           'PRIMARYPARK_CONFIGURED']}

HDU: PRIMARY KEYWORD: NOD_TYPE

enum

{ 'dmd': [ '2-SHUTTER-SLITLET',
           '3-POINT-NOD',
           '3-SHUTTER-SLITLET',
           '5-SHUTTER-SLITLET',
           '5-SHUTTER-SLITLET-WITH-GAP',
           'NONE'],
  'kwd': [ '2-SHUTTER-SLITLET',
           '3-POINT-NOD',
           '3-SHUTTER-SLITLET',
           '5-SHUTTER-SLITLET',
           '5-SHUTTER-SLITLET-WITH-GAP',
           '5-SHUTTER-SLITLET-WITH-GAPS',
           'NONE']}

HDU: PRIMARY KEYWORD: NUMDSETS

enum

{'dmd': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 'kwd': [MISSING VALUE]}

HDU: PRIMARY KEYWORD: NWFSEST

path

{'dmd': ['meta.nwfsest'], 'kwd': ['meta.basic.nwfsest']}

HDU: PRIMARY KEYWORD: OPMODE

enum

{ 'dmd': [ 'ANY',
           'BRIGHTOBJ',
           'FIXEDSLIT',
           'GRATING-ONLY',
           'IFU',
           'IMAGE',
           'MSASPEC',
           'N/A',
           'NONE'],
  'kwd': [ 'BRIGHTOBJ',
           'FIXEDSLIT',
           'GRATING-ONLY',
           'IFU',
           'IMAGE',
           'MSASPEC',
           'NONE']}

HDU: PRIMARY KEYWORD: ORIGIN

path

{'dmd': ['meta.origin'], 'kwd': ['meta.basic.origin']}

HDU: PRIMARY KEYWORD: OSS_VER

path

{ 'dmd': ['meta.oss_software_version'],
  'kwd': ['meta.basic.oss_software_version']}

HDU: PRIMARY KEYWORD: PATTSIZE

enum

{'dmd': [MISSING VALUE], 'kwd': ['DEFAULT', 'LARGE', 'MEDIUM', 'NONE', 'SMALL']}

HDU: PRIMARY KEYWORD: PRD_VER

path

{ 'dmd': ['meta.prd_software_version'],
  'kwd': ['meta.basic.prd_software_version']}

HDU: PRIMARY KEYWORD: PRIDTYPE

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ '1-17',
           '21',
           '25',
           '27',
           '2MINUS',
           '2PLUS',
           '2TIGHTGAPS',
           '36',
           '3TIGHT',
           '3TIGHTGAPS',
           '45',
           '4TIGHT',
           '5TIGHT',
           '6TIGHT',
           '8NIRSPEC']}

HDU: PRIMARY KEYWORD: PWFSEET

path

{'dmd': ['meta.pwfseet'], 'kwd': ['meta.basic.pwfseet']}

HDU: PRIMARY KEYWORD: ROIW

title

{ 'dmd': ['[um] Size of ROI in wavelength dimension'],
  'kwd': ['[arcsec] Size of ROI in spatial dimension']}

HDU: PRIMARY KEYWORD: SCATFILE

path

{'dmd': ['meta.source_catalog'], 'kwd': ['meta.resample.source_catalog']}

HDU: PRIMARY KEYWORD: SDP_VER

path

{ 'dmd': ['meta.data_processing_software_version'],
  'kwd': ['meta.basic.data_processing_software_version']}

HDU: PRIMARY KEYWORD: SEGMFILE

path

{'dmd': ['meta.segmentation_map'], 'kwd': ['meta.resample.segmentation_map']}

HDU: PRIMARY KEYWORD: SMGRDPAT

enum

{ 'dmd': [MISSING VALUE],
  'kwd': ['1-9', '5-POINT-BOX', '5-POINT-DIAMOND', '9-POINT-CIRCLE']}

HDU: PRIMARY KEYWORD: SUBARRAY

enum

{ 'dmd': [ '128X128',
           '2048X64',
           '32X32',
           '8X8',
           'ALLSLITS',
           'BRIGHTSKY',
           'FULL',
           'FULLP',
           'FULL_IRS2',
           'GENERIC',
           'MASK1065',
           'MASK1140',
           'MASK1550',
           'MASK210R',
           'MASK335R',
           'MASK430R',
           'MASKA210R',
           'MASKA430R',
           'MASKBLWB',
           'MASKBSWB',
           'MASKLWB',
           'MASKLYOT',
           'MASKSWB',
           'N/A',
           'S200A1',
           'S200A2',
           'S200B1',
           'S400A1',
           'SLITLESSPRISM',
           'SUB1024A',
           'SUB1024B',
           'SUB128',
           'SUB128CNTR',
           'SUB128DIAG',
           'SUB128LL',
           'SUB160',
           'SUB160P',
           'SUB2048',
           'SUB256',
           'SUB32',
           'SUB320',
           'SUB320A335R',
           'SUB320A430R',
           'SUB320ALWB',
           'SUB320B335R',
           'SUB320B430R',
           'SUB320BLWB',
           'SUB32CNTR',
           'SUB32DIAG',
           'SUB32LL',
           'SUB32TATS',
           'SUB32TATSGRISM',
           'SUB400P',
           'SUB400X256ALWB',
           'SUB512',
           'SUB512S',
           'SUB64',
           'SUB640',
           'SUB640A210R',
           'SUB640ASWB',
           'SUB640B210R',
           'SUB640BSWB',
           'SUB64FP1A',
           'SUB64FP1B',
           'SUB64P',
           'SUB80',
           'SUB8CNTR',
           'SUB8DIAG',
           'SUB8FP1A',
           'SUB8FP1B',
           'SUB8LL',
           'SUB96DHSPILA',
           'SUB96DHSPILB',
           'SUBAMPCAL',
           'SUBFSA210R',
           'SUBFSA335R',
           'SUBFSA430R',
           'SUBFSALWB',
           'SUBFSASWB',
           'SUBGRISM128',
           'SUBGRISM256',
           'SUBGRISM64',
           'SUBIDSTRIPCENTER',
           'SUBIDSTRIPLL',
           'SUBNDA210R',
           'SUBNDA335R',
           'SUBNDA430R',
           'SUBNDALWBL',
           'SUBNDALWBS',
           'SUBNDASWBL',
           'SUBNDASWBS',
           'SUBNDB210R',
           'SUBNDB335R',
           'SUBNDB430R',
           'SUBNDBLWBL',
           'SUBNDBLWBS',
           'SUBNDBSWBL',
           'SUBNDBSWBS',
           'SUBPRISM',
           'SUBS200A1',
           'SUBS200A2',
           'SUBS200B1',
           'SUBS400A1',
           'SUBSTRIP256',
           'SUBSTRIP80',
           'SUBSTRIP96',
           'SUBTAAMI',
           'SUBTASOSS',
           'SUBTUNE32CENTERG1',
           'SUBTUNE32CENTERG2',
           'SUBTUNE32LLG1',
           'SUBTUNE32LLG2',
           'WFSS128C',
           'WFSS128R',
           'WFSS64C',
           'WFSS64R'],
  'kwd': [ 'ALLSLITS',
           'BRIGHTSKY',
           'FULL',
           'FULLP',
           'MASK1065',
           'MASK1140',
           'MASK1550',
           'MASKLYOT',
           'SLITLESSPRISM',
           'SUB1024A',
           'SUB1024B',
           'SUB128',
           'SUB128CNTR',
           'SUB128DIAG',
           'SUB128LL',
           'SUB160',
           'SUB160P',
           'SUB160STRIPE4_DHS',
           'SUB2048',
           'SUB256',
           'SUB256STRIPE4_DHS',
           'SUB32',
           'SUB320',
           'SUB320A335R',
           'SUB320A430R',
           'SUB320ALWB',
           'SUB320B335R',
           'SUB320B430R',
           'SUB320BLWB',
           'SUB32CNTR',
           'SUB32DIAG',
           'SUB32LL',
           'SUB32TATS',
           'SUB32TATSGRISM',
           'SUB32TA_DHS',
           'SUB400P',
           'SUB400X256ALWB',
           'SUB40STRIPE1_DHS',
           'SUB512',
           'SUB512S',
           'SUB64',
           'SUB640',
           'SUB640A210R',
           'SUB640ASWB',
           'SUB640B210R',
           'SUB640BSWB',
           'SUB64FP1A',
           'SUB64FP1B',
           'SUB64P',
           'SUB80',
           'SUB80STRIPE2_DHS',
           'SUB8CNTR',
           'SUB8DIAG',
           'SUB8FP1A',
           'SUB8FP1B',
           'SUB8LL',
           'SUB96DHSPILA',
           'SUB96DHSPILB',
           'SUBAMPCAL',
           'SUBFSA210R',
           'SUBFSA335R',
           'SUBFSA430R',
           'SUBFSALWB',
           'SUBFSASWB',
           'SUBGRISM128',
           'SUBGRISM256',
           'SUBGRISM64',
           'SUBIDSTRIPCENTER',
           'SUBIDSTRIPLL',
           'SUBNDA210R',
           'SUBNDA335R',
           'SUBNDA430R',
           'SUBNDALWBL',
           'SUBNDALWBS',
           'SUBNDASWBL',
           'SUBNDASWBS',
           'SUBNDB210R',
           'SUBNDB335R',
           'SUBNDB430R',
           'SUBNDBLWBL',
           'SUBNDBLWBS',
           'SUBNDBSWBL',
           'SUBNDBSWBS',
           'SUBPRISM',
           'SUBS200A1',
           'SUBS200A2',
           'SUBS200B1',
           'SUBS400A1',
           'SUBSTRIP256',
           'SUBSTRIP96',
           'SUBSTRIPE256',
           'SUBTAAMI',
           'SUBTASOSS',
           'SUBTUNE32CENTERG1',
           'SUBTUNE32CENTERG2',
           'SUBTUNE32LLG1',
           'SUBTUNE32LLG2',
           'WFSS128C',
           'WFSS128R',
           'WFSS64C',
           'WFSS64R']}

HDU: PRIMARY KEYWORD: SUBCAT

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ 'ERO',
           'FGS',
           'MIRI',
           'NIRCAM',
           'NIRISS',
           'NIRSPEC',
           'NONE',
           'OTE',
           'SC']}

HDU: PRIMARY KEYWORD: SUBPXPAT

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ '2-POINT',
           '2_POINT',
           '2_POINT_LARGE_WITH_NIRISS',
           '2_POINT_MEDIUM_WITH_NIRISS',
           '2_POINT_WITH_MIRI_F1000W',
           '2_POINT_WITH_MIRI_F1280W',
           '2_POINT_WITH_MIRI_F1500W',
           '2_POINT_WITH_MIRI_F1800W',
           '2_POINT_WITH_MIRI_F2100W',
           '2_POINT_WITH_MIRI_F2550W',
           '2_POINT_WITH_MIRI_F770W',
           '3_POINT_LARGE_WITH_NIRISS',
           '3_POINT_MEDIUM_WITH_NIRISS',
           '3_POINT_SMALL_WITH_NIRISS',
           '3_POINT_WITH_MIRI_F1000W',
           '3_POINT_WITH_MIRI_F1280W',
           '3_POINT_WITH_MIRI_F1500W',
           '3_POINT_WITH_MIRI_F1800W',
           '3_POINT_WITH_MIRI_F2100W',
           '3_POINT_WITH_MIRI_F2550W',
           '3_POINT_WITH_MIRI_F560W',
           '3_POINT_WITH_MIRI_F770W',
           '4-POINT',
           '4_POINT',
           '4_POINT_LARGE_WITH_NIRISS',
           '4_POINT_MEDIUM_WITH_NIRISS',
           '4_POINT_SMALL_WITH_NIRISS',
           '4_POINT_WITH_MIRI_F1000W',
           '4_POINT_WITH_MIRI_F1280W',
           '4_POINT_WITH_MIRI_F1500W',
           '4_POINT_WITH_MIRI_F1800W',
           '4_POINT_WITH_MIRI_F2100W',
           '4_POINT_WITH_MIRI_F2550W',
           '4_POINT_WITH_MIRI_F560W',
           '4_POINT_WITH_MIRI_F770W',
           '9-POINT',
           '9_POINT',
           '9_POINT_LARGE_WITH_NIRISS',
           '9_POINT_MEDIUM_WITH_NIRISS',
           '9_POINT_WITH_MIRI_F1000W',
           '9_POINT_WITH_MIRI_F1500W',
           '9_POINT_WITH_MIRI_F1800W',
           '9_POINT_WITH_MIRI_F2100W',
           '9_POINT_WITH_MIRI_F770W',
           'BOTH',
           'IMAGING',
           'NONE',
           'SMALL_GRID_DITHER',
           'SPATIAL',
           'SPECTRAL',
           'STANDARD']}

HDU: PRIMARY KEYWORD: TARGTYPE

enum

{'dmd': [MISSING VALUE], 'kwd': ['FIXED', 'GENERIC', 'MOVING', 'UNKNOWN']}

HDU: PRIMARY KEYWORD: TCATFILE

path

{'dmd': ['meta.tweakreg_catalog'], 'kwd': ['meta.resample.tweakreg_catalog']}

HDU: PRIMARY KEYWORD: TELESCOP

path

{'dmd': ['meta.telescope'], 'kwd': ['meta.basic.telescope']}

HDU: PRIMARY KEYWORD: TEMPLATE

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ 'FGS External Calibration',
           'FGS Focus',
           'FGS Internal Flat',
           'ISIM ASIC Tuning',
           'ISIM Dictionary File Update',
           'MIRI Anneal',
           'MIRI Coronagraphic Imaging',
           'MIRI Coronagraphic Photometric Calibration',
           'MIRI Dark',
           'MIRI Imaging',
           'MIRI Low Resolution Spectroscopy',
           'MIRI Medium Resolution Spectroscopy',
           'MIRI Multi-Instrument Multi-Field Imaging',
           'Momentum Unload',
           'NIRCam Coronagraphic Imaging',
           'NIRCam Dark',
           'NIRCam Engineering Imaging',
           'NIRCam External Flat',
           'NIRCam Focus',
           'NIRCam Grism Time Series',
           'NIRCam IPR Imaging',
           'NIRCam Imaging',
           'NIRCam PIL Imaging',
           'NIRCam Time Series',
           'NIRCam Wheel Exercise',
           'NIRISS Aperture Masking Interferometry',
           'NIRISS Dark',
           'NIRISS Focus',
           'NIRISS Imaging',
           'NIRISS Internal Flat',
           'NIRISS Single-Object Slitless Spectroscopy',
           'NIRISS Wide Field Slitless Spectroscopy',
           'NIRSpec Bright Object Time Series',
           'NIRSpec Dark',
           'NIRSpec Filter/Grating Wheel Test',
           'NIRSpec Fixed Slit Spectroscopy',
           'NIRSpec Focus',
           'NIRSpec Focus Reference',
           'NIRSpec IFU Spectroscopy',
           'NIRSpec Imaging',
           'NIRSpec Internal Lamp',
           'NIRSpec MSA Anneal',
           'NIRSpec MSA Masking',
           'NIRSpec MSA Short Detection',
           'NIRSpec Multi-Instrument Multi-Field Imaging',
           'NIRSpec MultiObject Spectroscopy',
           'Pointing Only',
           'Realtime Commanding',
           'Safe Mode Recovery',
           'Station Keeping',
           'WFSC Commissioning',
           'WFSC Commissioning Control Only',
           'WFSC Global Alignment',
           'WFSC NIRCam Coarse Phasing',
           'WFSC NIRCam Fine Phasing']}

HDU: PRIMARY KEYWORD: TIMESYS

path

{'dmd': ['meta.time_sys'], 'kwd': ['meta.basic.time_sys']}

HDU: PRIMARY KEYWORD: VISITSTA

enum

{ 'dmd': [MISSING VALUE],
  'kwd': [ 'DATALOSS',
           'SKIPPED',
           'SKIPPED_COORDINATED',
           'SUCCESSFUL',
           'UNSUCCESSFUL']}

HDU: SCI KEYWORD: SRCTYPE

enum

{'dmd': ['EXTENDED', 'POINT', 'UNKNOWN'], 'kwd': [MISSING VALUE]}

HDU: SCI KEYWORD: STLARITY

title

{ 'dmd': ['Source stellarity'],
  'kwd': ['Advised type of calibration processing for source']}

HDU: SCI KEYWORD: VPARITY

title

{ 'dmd': ['Relative sense of rotation between Ideal xy and V2V3'],
  'kwd': ['Parity (sense) of aperture settings (1, -1)']}

tapastro

👏

braingram · 2024-11-19T15:21:51Z

Regression test run started for okifying: https://github.com/spacetelescope/RegressionTests/actions/runs/11916164763
Once this finishes I'll merge this PR and okify the results.

braingram marked this pull request as ready for review November 1, 2024 20:00

braingram requested a review from a team as a code owner November 1, 2024 20:00

braingram requested a review from tapastro November 1, 2024 20:00

braingram commented Nov 1, 2024

View reviewed changes

stscijgbot-jp mentioned this pull request Nov 1, 2024

Perform routine comparison between keyword dictionary and datamodel schemas. spacetelescope/jwst#8785

Open

braingram force-pushed the kwd_alignment branch from 4fb9dba to 4a0cf0a Compare November 12, 2024 20:07

tapastro approved these changes Nov 18, 2024

View reviewed changes

braingram added 19 commits November 18, 2024 12:42

add enum to S_ keywords

108f4c1

align cal_step titles

48c0b35

align multispec titles

acb39c4

align oifits titles

228c1db

align DATAEND title

cb70d1c

align DATASTRT title

3d975c1

align DRPFRMS1 and DRPFRMS3 titles

d6c088b

align DSETSTRT title, remove enum, kwd says 1-10, no 0

a6900f6

allow integer FOCUSPOS

075427c

align GSCENTX GSCENTY titles

bbc015d

align GS_MUDEC and GS_MURA titles

a690fbb

align MODULE title

c6121b8

align MRSPRCHN title and enum

a208c57

align MU_RA MU_DEC MU_EPOCH titles

1d900f5

align NRESETS title

d1a8418

align NRIMDTPT title

e72705b

align NRSTSTRT title

15eeb96

align NUMDSETS title

3c0ee81

align NUMDTHPT title

112a153

braingram added 21 commits November 18, 2024 12:42

align NWFSEST and PWFSEET titles

c93ff3d

align PROP_RA and PROP_DEC titles

1c744b6

align R_ titles

bb871b5

align RA_REF titles

383ca7a

align SDP_VER title

dee5412

align SPATNSTP title

2f4d82e

align SPECNSTP title

107f15a

align TARG_RA TARG_DEC TARGURA TARUDEC titles

ad3e4ab

align VISITEND title

b13d913

align XOFFSET YOFFSET titles

7655fff

align WTYPE title

62516e1

align crpix crval titles

23c29d0

correct MJD-AVG typo

35a80b8

align PCX_X titles

4ef1df6

align REFFRAME title

74a5a66

align SHUTSTA title

263ede1

align SLT keyword names

f56fc38

align SOURCEID title

d692204

align S_REGION title

38974ee

align WAVSTART WAVEND titles

1e34809

add changelog

3420dc9

braingram force-pushed the kwd_alignment branch from bb70eef to 3420dc9 Compare November 18, 2024 17:43

braingram merged commit f3fd295 into spacetelescope:main Nov 19, 2024
22 checks passed

braingram deleted the kwd_alignment branch November 19, 2024 20:33

This was referenced Nov 20, 2024

test_miri_mrs_badpix_selfcal_bkg fails okify spacetelescope/jwst#8968

Closed

restructure test_miri_mrs_badpix_selfcal_bkg to allow it to be okified spacetelescope/jwst#8971

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Address (some) keyword differences #354

Address (some) keyword differences #354

braingram commented Nov 1, 2024 •

edited

Loading

codecov bot commented Nov 1, 2024 •

edited

Loading

braingram Nov 1, 2024

braingram Nov 1, 2024

braingram Nov 1, 2024

braingram commented Nov 1, 2024 •

edited

Loading

tapastro left a comment

braingram commented Nov 19, 2024

Address (some) keyword differences #354

Address (some) keyword differences #354

Conversation

braingram commented Nov 1, 2024 • edited Loading

Tasks

codecov bot commented Nov 1, 2024 • edited Loading

Codecov Report

braingram Nov 1, 2024

Choose a reason for hiding this comment

braingram Nov 1, 2024

Choose a reason for hiding this comment

braingram Nov 1, 2024

Choose a reason for hiding this comment

braingram commented Nov 1, 2024 • edited Loading

tapastro left a comment

Choose a reason for hiding this comment

braingram commented Nov 19, 2024

braingram commented Nov 1, 2024 •

edited

Loading

codecov bot commented Nov 1, 2024 •

edited

Loading

braingram commented Nov 1, 2024 •

edited

Loading