Merge branch 'main' into JP-3449

spacetelescope · Jan 24, 2024 · f6ac853 · f6ac853
2 parents 29992aa + cf23293
commit f6ac853
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,7 +16,14 @@ Other
 -----
 
 - Updated JWST core datamodel schema to include the new
-  TMEASURE keyword for measurement time. [#248]
+  ``TMEASURE`` keyword for measurement time. [#248]
+
+- Add ``ngroups`` keyword to JWST ``mask`` datamodel schema to match
+  parkeys on crds [#249]
+
+- Added keywords ``noutputs`` and ``bunit`` to the JWST
+  readnoise and superbias datamodel schemas. [#250]
+
 
 1.9.0 (2023-12-11)
 ==================

diff --git a/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml
@@ -8,6 +8,7 @@ allOf:
 - $ref: keyword_exptype.schema
 - $ref: keyword_readpatt.schema
 - $ref: keyword_preadpatt.schema
+- $ref: keyword_ngroups.schema
 - type: object
   properties:
     dq:

diff --git a/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml
@@ -8,6 +8,7 @@ allOf:
 - $ref: keyword_readpatt.schema
 - $ref: keyword_preadpatt.schema
 - $ref: keyword_gainfact.schema
+- $ref: keyword_noutputs.schema
 - $ref: bunit.schema
 - type: object
   properties:

diff --git a/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml
@@ -8,6 +8,8 @@ allOf:
 - $ref: keyword_readpatt.schema
 - $ref: keyword_preadpatt.schema
 - $ref: keyword_gainfact.schema
+- $ref: keyword_noutputs.schema
+- $ref: bunit.schema
 - type: object
   properties:
     data:

diff --git a/src/stdatamodels/jwst/datamodels/tests/test_schema_against_crds.py b/src/stdatamodels/jwst/datamodels/tests/test_schema_against_crds.py
@@ -239,7 +239,7 @@ def test_crds_selectors_vs_datamodel(jail_environ, instrument):
                     # No need to actually load the reference file into the datamodel!
                     with ref_model() as m:
                         for key in parkeys:
-                            assert len(m.search_schema(key.lower())) > 0
+                            assert len(m.search_schema(key.lower())) > 0, f"{f} missing {key} required by {r.basename}"
                     break
         except IrrelevantReferenceTypeError as e:
             log.debug(e)