From b49f5f437e49322c5fcc48bd47052779c6a066de Mon Sep 17 00:00:00 2001 From: Brett Graham Date: Thu, 23 Jan 2025 12:16:22 -0500 Subject: [PATCH] Remove fits metaschema (#378) --- changes/378.removal.rst | 1 + docs/source/jwst/datamodels/schemas.rst | 4 ++-- .../jwst/datamodels/integration.py | 4 ---- .../jwst/datamodels/metaschema/__init__.py | 0 .../datamodels/metaschema/fits-schema.yaml | 19 ------------------- .../jwst/datamodels/schemas/ami.schema.yaml | 2 +- .../jwst/datamodels/schemas/amilg.schema.yaml | 2 +- .../schemas/amilgfitmodel.schema.yaml | 2 +- .../jwst/datamodels/schemas/amioi.schema.yaml | 2 +- .../jwst/datamodels/schemas/asn.schema.yaml | 2 +- .../datamodels/schemas/barshadow.schema.yaml | 2 +- .../jwst/datamodels/schemas/bunit.schema.yaml | 2 +- .../jwst/datamodels/schemas/cheby.schema.yaml | 2 +- .../schemas/combinedspec.schema.yaml | 2 +- .../schemas/combinedspectable.schema.yaml | 2 +- .../datamodels/schemas/contrast.schema.yaml | 2 +- .../jwst/datamodels/schemas/core.schema.yaml | 2 +- .../jwst/datamodels/schemas/cube.schema.yaml | 2 +- .../jwst/datamodels/schemas/dark.schema.yaml | 2 +- .../datamodels/schemas/darkMIRI.schema.yaml | 2 +- .../datamodels/schemas/dq_def.schema.yaml | 2 +- .../schemas/extract1dimage.schema.yaml | 2 +- .../schemas/fgsimg_apcorr.schema.yaml | 2 +- .../schemas/fgsimg_photom.schema.yaml | 2 +- .../jwst/datamodels/schemas/flat.schema.yaml | 2 +- .../datamodels/schemas/flatcorr.schema.yaml | 2 +- .../datamodels/schemas/fringe.schema.yaml | 2 +- .../schemas/fringe_freq.schema.yaml | 2 +- .../jwst/datamodels/schemas/gain.schema.yaml | 2 +- .../schemas/gls_rampfit.schema.yaml | 2 +- .../jwst/datamodels/schemas/group.schema.yaml | 2 +- .../datamodels/schemas/guider_cal.schema.yaml | 2 +- .../schemas/guider_meta.schema.yaml | 2 +- .../datamodels/schemas/guider_raw.schema.yaml | 2 +- .../datamodels/schemas/ifucube.schema.yaml | 2 +- .../schemas/ifucubepars.schema.yaml | 2 +- .../datamodels/schemas/ifuimage.schema.yaml | 2 +- .../jwst/datamodels/schemas/image.schema.yaml | 2 +- .../datamodels/schemas/int_times.schema.yaml | 2 +- .../jwst/datamodels/schemas/ipc.schema.yaml | 2 +- .../jwst/datamodels/schemas/irs2.schema.yaml | 2 +- .../schemas/keyword_band.schema.yaml | 2 +- .../schemas/keyword_channel.schema.yaml | 2 +- .../schemas/keyword_coronmsk.schema.yaml | 2 +- .../schemas/keyword_darkcurrent.schema.yaml | 2 +- .../schemas/keyword_exptype.schema.yaml | 2 +- .../schemas/keyword_filter.schema.yaml | 2 +- .../schemas/keyword_gainfact.schema.yaml | 2 +- .../schemas/keyword_grating.schema.yaml | 2 +- .../schemas/keyword_groupgap.schema.yaml | 2 +- .../schemas/keyword_lampmode.schema.yaml | 2 +- .../schemas/keyword_lampstate.schema.yaml | 2 +- .../schemas/keyword_module.schema.yaml | 2 +- .../schemas/keyword_nframes.schema.yaml | 2 +- .../schemas/keyword_ngroups.schema.yaml | 2 +- .../schemas/keyword_nints.schema.yaml | 2 +- .../schemas/keyword_noutputs.schema.yaml | 2 +- .../schemas/keyword_pband.schema.yaml | 2 +- .../schemas/keyword_pchannel.schema.yaml | 2 +- .../schemas/keyword_pdetector.schema.yaml | 2 +- .../schemas/keyword_pexptype.schema.yaml | 2 +- .../schemas/keyword_pfilter.schema.yaml | 2 +- .../schemas/keyword_pgrating.schema.yaml | 2 +- .../schemas/keyword_photmjsr.schema.yaml | 2 +- .../schemas/keyword_pixelarea.schema.yaml | 2 +- .../schemas/keyword_ppupil.schema.yaml | 2 +- .../schemas/keyword_preadpatt.schema.yaml | 2 +- .../schemas/keyword_psubarray.schema.yaml | 2 +- .../schemas/keyword_pupil.schema.yaml | 2 +- .../schemas/keyword_readpatt.schema.yaml | 2 +- .../schemas/keyword_tsovisit.schema.yaml | 2 +- .../datamodels/schemas/lastframe.schema.yaml | 2 +- .../datamodels/schemas/level1b.schema.yaml | 2 +- .../datamodels/schemas/linearity.schema.yaml | 2 +- .../jwst/datamodels/schemas/mask.schema.yaml | 2 +- .../schemas/miri_ifucubepars.schema.yaml | 2 +- .../schemas/miri_mrsptcorr.schema.yaml | 2 +- .../schemas/miri_mrsxartcorr.schema.yaml | 2 +- .../schemas/miri_resolution.schema.yaml | 2 +- .../schemas/mirimg_apcorr.schema.yaml | 2 +- .../schemas/mirimg_photom.schema.yaml | 2 +- .../schemas/mirlrs_apcorr.schema.yaml | 2 +- .../schemas/mirlrs_pathloss.schema.yaml | 2 +- .../schemas/mirlrs_photom.schema.yaml | 2 +- .../schemas/mirmrs_extract1d.schema.yaml | 2 +- .../schemas/mirmrs_photom.schema.yaml | 2 +- .../schemas/moving_target.schema.yaml | 2 +- .../schemas/mrs_multispec.schema.yaml | 2 +- .../datamodels/schemas/mrs_spec.schema.yaml | 2 +- .../schemas/mrs_spectable.schema.yaml | 2 +- .../datamodels/schemas/msatargacq.schema.yaml | 2 +- .../schemas/multicombinedspec.schema.yaml | 2 +- .../schemas/multiexposure.schema.yaml | 2 +- .../schemas/multiextract1d.schema.yaml | 2 +- .../datamodels/schemas/multislit.schema.yaml | 2 +- .../datamodels/schemas/multispec.schema.yaml | 2 +- .../schemas/nirspec_area_ifu.schema.yaml | 2 +- .../schemas/nirspec_area_mos.schema.yaml | 2 +- .../schemas/nirspec_area_slit.schema.yaml | 2 +- .../schemas/nirspec_flat.schema.yaml | 2 +- .../schemas/nirspec_ifucubepars.schema.yaml | 2 +- .../schemas/nirspec_quad_flat.schema.yaml | 2 +- .../schemas/nisimg_apcorr.schema.yaml | 2 +- .../schemas/nisimg_photom.schema.yaml | 2 +- .../schemas/nissoss_photom.schema.yaml | 2 +- .../schemas/niswfss_apcorr.schema.yaml | 2 +- .../schemas/niswfss_photom.schema.yaml | 2 +- .../schemas/nrcimg_apcorr.schema.yaml | 2 +- .../schemas/nrcimg_photom.schema.yaml | 2 +- .../schemas/nrcwfss_apcorr.schema.yaml | 2 +- .../schemas/nrcwfss_photom.schema.yaml | 2 +- .../jwst/datamodels/schemas/nrm.schema.yaml | 2 +- .../schemas/nrsfs_apcorr.schema.yaml | 2 +- .../schemas/nrsfs_photom.schema.yaml | 2 +- .../schemas/nrsmos_apcorr.schema.yaml | 2 +- .../schemas/nrsmos_photom.schema.yaml | 2 +- .../datamodels/schemas/oifits.schema.yaml | 2 +- .../schemas/outlierifuoutput.schema.yaml | 2 +- .../schemas/outlierpars.schema.yaml | 2 +- .../schemas/pastasossmodel.schema.yaml | 2 +- .../datamodels/schemas/pathloss.schema.yaml | 2 +- .../schemas/pathlosscorr.schema.yaml | 2 +- .../datamodels/schemas/persat.schema.yaml | 2 +- .../datamodels/schemas/photomcorr.schema.yaml | 2 +- .../datamodels/schemas/photometry.schema.yaml | 2 +- .../datamodels/schemas/pixelarea.schema.yaml | 2 +- .../datamodels/schemas/psfmask.schema.yaml | 2 +- .../jwst/datamodels/schemas/quad.schema.yaml | 2 +- .../jwst/datamodels/schemas/ramp.schema.yaml | 2 +- .../schemas/rampfitoutput.schema.yaml | 2 +- .../datamodels/schemas/readnoise.schema.yaml | 2 +- .../schemas/referencecube.schema.yaml | 2 +- .../schemas/referencefile.schema.yaml | 2 +- .../schemas/referenceimage.schema.yaml | 2 +- .../schemas/referencequad.schema.yaml | 2 +- .../jwst/datamodels/schemas/reset.schema.yaml | 2 +- .../datamodels/schemas/resolution.schema.yaml | 2 +- .../jwst/datamodels/schemas/rscd.schema.yaml | 2 +- .../datamodels/schemas/saturation.schema.yaml | 2 +- .../datamodels/schemas/segmap.schema.yaml | 2 +- .../jwst/datamodels/schemas/slit.schema.yaml | 2 +- .../datamodels/schemas/slitdata.schema.yaml | 2 +- .../datamodels/schemas/slitmeta.schema.yaml | 2 +- .../schemas/sossextractmodel.schema.yaml | 2 +- .../schemas/sosswavegrid.schema.yaml | 2 +- .../jwst/datamodels/schemas/spec.schema.yaml | 2 +- .../datamodels/schemas/speckernel.schema.yaml | 2 +- .../datamodels/schemas/specmeta.schema.yaml | 2 +- .../schemas/specprofile.schema.yaml | 2 +- .../schemas/specprofilesingle.schema.yaml | 2 +- .../datamodels/schemas/specpsf.schema.yaml | 2 +- .../datamodels/schemas/spectable.schema.yaml | 2 +- .../datamodels/schemas/spectrace.schema.yaml | 2 +- .../schemas/spectracesingle.schema.yaml | 2 +- .../schemas/spectracetable.schema.yaml | 2 +- .../datamodels/schemas/straylight.schema.yaml | 2 +- .../datamodels/schemas/subarray.schema.yaml | 2 +- .../datamodels/schemas/superbias.schema.yaml | 2 +- .../datamodels/schemas/throughput.schema.yaml | 2 +- .../schemas/trapdensity.schema.yaml | 2 +- .../datamodels/schemas/trappars.schema.yaml | 2 +- .../schemas/trapsfilled.schema.yaml | 2 +- .../datamodels/schemas/tsophot.schema.yaml | 2 +- .../datamodels/schemas/variance.schema.yaml | 2 +- .../datamodels/schemas/wavemap.schema.yaml | 2 +- .../schemas/wavemapsingle.schema.yaml | 2 +- .../datamodels/schemas/wcsinfo.schema.yaml | 2 +- .../datamodels/schemas/wfssbkg.schema.yaml | 2 +- .../nonstandard_primary_array.schema.yaml | 2 +- .../jwst/datamodels/tests/test_integration.py | 8 ++------ .../nonstandard_primary_array.schema.yaml | 2 +- tests/test_fits.py | 4 ++-- 172 files changed, 172 insertions(+), 198 deletions(-) create mode 100644 changes/378.removal.rst delete mode 100644 src/stdatamodels/jwst/datamodels/metaschema/__init__.py delete mode 100644 src/stdatamodels/jwst/datamodels/metaschema/fits-schema.yaml diff --git a/changes/378.removal.rst b/changes/378.removal.rst new file mode 100644 index 00000000..ab2da97a --- /dev/null +++ b/changes/378.removal.rst @@ -0,0 +1 @@ +Remove fits metaschema, use updated asdf metaschema. diff --git a/docs/source/jwst/datamodels/schemas.rst b/docs/source/jwst/datamodels/schemas.rst index 7b678f78..ddf364ab 100644 --- a/docs/source/jwst/datamodels/schemas.rst +++ b/docs/source/jwst/datamodels/schemas.rst @@ -21,7 +21,7 @@ data models. Here is a (partial) example: %YAML 1.1 --- - $schema: "http://stsci.edu/schemas/fits-schema/fits-schema" + $schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ramp.schema" allOf: - $ref: core.schema @@ -45,7 +45,7 @@ but use a different set of shared schemas. %YAML 1.1 --- - $schema: "http://stsci.edu/schemas/fits-schema/fits-schema" + $schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/dark.schema" title: Dark current data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/integration.py b/src/stdatamodels/jwst/datamodels/integration.py index 93c544a2..ada3d870 100644 --- a/src/stdatamodels/jwst/datamodels/integration.py +++ b/src/stdatamodels/jwst/datamodels/integration.py @@ -29,9 +29,5 @@ def get_resource_mappings(): DirectoryResourceMapping( resources_root / "schemas", "http://stsci.edu/schemas/jwst_datamodel/", - ), - DirectoryResourceMapping( - resources_root / "metaschema", - "http://stsci.edu/schemas/fits-schema/", ) ] diff --git a/src/stdatamodels/jwst/datamodels/metaschema/__init__.py b/src/stdatamodels/jwst/datamodels/metaschema/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/stdatamodels/jwst/datamodels/metaschema/fits-schema.yaml b/src/stdatamodels/jwst/datamodels/metaschema/fits-schema.yaml deleted file mode 100644 index b5359c22..00000000 --- a/src/stdatamodels/jwst/datamodels/metaschema/fits-schema.yaml +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 ---- -$schema: "http://json-schema.org/draft-04/schema" -id: "http://stsci.edu/schemas/fits-schema/fits-schema" -description: | - A metaschema extending ASDF's YAML schema to support things specific - to converting models to and from FITS files. - -allOf: - - $ref: "http://stsci.edu/schemas/asdf/asdf-schema-1.0.0" - - type: object - properties: - fits_keyword: - type: string - - fits_hdu: - anyOf: - - type: string - - type: integer diff --git a/src/stdatamodels/jwst/datamodels/schemas/ami.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ami.schema.yaml index ff5cd290..a868485c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ami.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ami.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ami.schema" allOf: - $ref: wcsinfo.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/amilg.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/amilg.schema.yaml index 946a55d3..045e6d1c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/amilg.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/amilg.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/amilg.schema" title: AMI LG analysis data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/amilgfitmodel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/amilgfitmodel.schema.yaml index 17e17499..1019a763 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/amilgfitmodel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/amilgfitmodel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/amilgfitmodel.schema" title: AMI LG analysis data model description: | diff --git a/src/stdatamodels/jwst/datamodels/schemas/amioi.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/amioi.schema.yaml index 6f00db9c..8d4683d3 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/amioi.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/amioi.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/amioi.schema" title: AMI OIFITS analysis data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/asn.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/asn.schema.yaml index 9862c2ad..317fa64f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/asn.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/asn.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/asn.schema" title: Association table data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/barshadow.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/barshadow.schema.yaml index a928dfb2..d69eb4ef 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/barshadow.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/barshadow.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/barshadow.schema" title: Bar shadow correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/bunit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/bunit.schema.yaml index bb0adbce..82dc34c2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/bunit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/bunit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/bunit.schema" allOf: - type: object diff --git a/src/stdatamodels/jwst/datamodels/schemas/cheby.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/cheby.schema.yaml index ad64bc6e..e54d1344 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/cheby.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/cheby.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/cheby.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/combinedspec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/combinedspec.schema.yaml index 14bd1ee7..6b69bf27 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/combinedspec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/combinedspec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/combinedspec.schema" title: Combined spectrum data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/combinedspectable.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/combinedspectable.schema.yaml index 84ee88c3..b46a6900 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/combinedspectable.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/combinedspectable.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/combinedspectable.schema" title: Combined, extracted spectral data table fits_hdu: COMBINE1D diff --git a/src/stdatamodels/jwst/datamodels/schemas/contrast.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/contrast.schema.yaml index e52f5714..5204cd19 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/contrast.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/contrast.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/contrast.schema" title: Coronagraphic contrast curve data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml index 64a19c37..267b9ade 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/core.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/cube.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/cube.schema.yaml index 49f3b37a..6dfae241 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/cube.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/cube.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/cube.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/dark.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/dark.schema.yaml index 9e120071..af552770 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/dark.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/dark.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/dark.schema" title: Dark current data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/darkMIRI.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/darkMIRI.schema.yaml index 019870d3..a18dce60 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/darkMIRI.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/darkMIRI.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/darkMIRI.schema" title: MIRI Dark current data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/dq_def.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/dq_def.schema.yaml index 1d87855f..dad5b8af 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/dq_def.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/dq_def.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/dq_def.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml index d53c893f..5105a8b9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/extract1dimage.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/extract1dimage.schema" title: 1-D extraction regions array allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/fgsimg_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/fgsimg_apcorr.schema.yaml index 33057053..40a1d11a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/fgsimg_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/fgsimg_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/fgsimg_apcorr.schema" title: FGS aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/fgsimg_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/fgsimg_photom.schema.yaml index 0b3eac49..b61adeb9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/fgsimg_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/fgsimg_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/fgsimg_photom.schema" title: FGS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/flat.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/flat.schema.yaml index ebb12e55..55d06054 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/flat.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/flat.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/flat.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/flatcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/flatcorr.schema.yaml index 916cd0a5..2707f210 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/flatcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/flatcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/flatcorr.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/fringe.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/fringe.schema.yaml index cdcf8001..9a6a66e6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/fringe.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/fringe.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/fringe.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/fringe_freq.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/fringe_freq.schema.yaml index 8c38fdef..402f8352 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/fringe_freq.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/fringe_freq.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/fringe_freq.schema" title: Default MIRI Residual Fringe Correction allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/gain.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/gain.schema.yaml index 5c828fae..f19d86a4 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/gain.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/gain.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/gain.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/gls_rampfit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/gls_rampfit.schema.yaml index 92bcd52e..bd6f4b6e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/gls_rampfit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/gls_rampfit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/gls_rampfit.schema" title: Optional output for GLS ramp fitting allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/group.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/group.schema.yaml index 1151ba15..3377af56 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/group.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/group.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/group.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/guider_cal.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/guider_cal.schema.yaml index 52691687..e5be1406 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/guider_cal.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/guider_cal.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/guider_cal.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/guider_meta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/guider_meta.schema.yaml index 95aa75f5..568ea4e9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/guider_meta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/guider_meta.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/guider_meta.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/guider_raw.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/guider_raw.schema.yaml index db9da7fb..d392f063 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/guider_raw.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/guider_raw.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/guider_raw.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml index 8e7fddec..cba7e70f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ifucube.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ifucube.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/ifucubepars.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ifucubepars.schema.yaml index 90bc55df..9bca92af 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ifucubepars.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ifucubepars.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ifucubepars.schema" title: Default IFU CUBE parameters data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/ifuimage.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ifuimage.schema.yaml index 889de573..40d38945 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ifuimage.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ifuimage.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ifuimage.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/image.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/image.schema.yaml index 8d66ac41..90474632 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/image.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/image.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/image.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/int_times.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/int_times.schema.yaml index c913ab44..252ba269 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/int_times.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/int_times.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/int_times.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/ipc.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ipc.schema.yaml index c9ccbdd2..9e2efaf9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ipc.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ipc.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ipc.schema" title: IPC kernel model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/irs2.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/irs2.schema.yaml index eac910a6..36c65ba2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/irs2.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/irs2.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/irs2.schema" title: IRS2 refpix reference file data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_band.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_band.schema.yaml index 67d78078..d42366da 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_band.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_band.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_band.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_channel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_channel.schema.yaml index dd2b6c87..f5d38196 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_channel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_channel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_channel.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_coronmsk.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_coronmsk.schema.yaml index 864c2b2d..32c81626 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_coronmsk.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_coronmsk.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_coronmsk.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_darkcurrent.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_darkcurrent.schema.yaml index b037a758..c3da8018 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_darkcurrent.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_darkcurrent.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_darkcurrent.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_exptype.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_exptype.schema.yaml index 6d19aa9c..1b257ece 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_exptype.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_exptype.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_exptype.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_filter.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_filter.schema.yaml index e90fb66d..a1588bfe 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_filter.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_filter.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_filter.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_gainfact.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_gainfact.schema.yaml index 8e0c90d3..553f4361 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_gainfact.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_gainfact.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_gainfact.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_grating.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_grating.schema.yaml index c6ccbb58..dd1b7fde 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_grating.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_grating.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_grating.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_groupgap.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_groupgap.schema.yaml index c775e98b..94d3a1b6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_groupgap.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_groupgap.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_groupgap.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_lampmode.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_lampmode.schema.yaml index 8204e167..b5e1ed33 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_lampmode.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_lampmode.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_lampmode.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_lampstate.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_lampstate.schema.yaml index 5ed38ffc..3f436558 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_lampstate.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_lampstate.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_lampstate.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_module.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_module.schema.yaml index ef01be94..94ef1324 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_module.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_module.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_module.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_nframes.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_nframes.schema.yaml index bad1f984..87b22db6 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_nframes.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_nframes.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_nframes.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_ngroups.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_ngroups.schema.yaml index 556db72c..be1684ea 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_ngroups.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_ngroups.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_ngroups.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_nints.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_nints.schema.yaml index f42d635f..5042e792 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_nints.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_nints.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_nints.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_noutputs.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_noutputs.schema.yaml index a9ee5828..202306d8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_noutputs.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_noutputs.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_noutputs.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pband.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pband.schema.yaml index d2de2aca..fb69eeea 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pband.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pband.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pband.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pchannel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pchannel.schema.yaml index 76752f32..4ab0d0d9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pchannel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pchannel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pchannel.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pdetector.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pdetector.schema.yaml index 71b35d71..68703f65 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pdetector.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pdetector.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pdetector.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pexptype.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pexptype.schema.yaml index 8dcbd26b..9e4412bf 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pexptype.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pexptype.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pexptype.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pfilter.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pfilter.schema.yaml index ab1ef1ef..9c307029 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pfilter.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pfilter.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pfilter.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pgrating.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pgrating.schema.yaml index 44630b07..996c9c83 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pgrating.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pgrating.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pgrating.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_photmjsr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_photmjsr.schema.yaml index d8ff7dc9..62d296f7 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_photmjsr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_photmjsr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_photmjsr.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pixelarea.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pixelarea.schema.yaml index 90bcc58f..05bfcbca 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pixelarea.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pixelarea.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pixelarea.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_ppupil.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_ppupil.schema.yaml index c9b70ecf..e6512d7b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_ppupil.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_ppupil.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_ppupil.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_preadpatt.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_preadpatt.schema.yaml index 02a07996..4b0c22b9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_preadpatt.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_preadpatt.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_preadpatt.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_psubarray.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_psubarray.schema.yaml index b2cb3793..03a0a5e7 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_psubarray.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_psubarray.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_psubarray.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_pupil.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_pupil.schema.yaml index aa6bdc87..110ea924 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_pupil.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_pupil.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_pupil.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_readpatt.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_readpatt.schema.yaml index 962690be..45eb03c7 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_readpatt.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_readpatt.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_readpatt.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/keyword_tsovisit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/keyword_tsovisit.schema.yaml index f42788df..795bd43c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/keyword_tsovisit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/keyword_tsovisit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/keyword_tsovisit.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/lastframe.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/lastframe.schema.yaml index 02638418..35f9d37e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/lastframe.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/lastframe.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/lastframe.schema" title: Last Frame Correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/level1b.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/level1b.schema.yaml index 57174864..5da840aa 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/level1b.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/level1b.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/level1b.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/linearity.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/linearity.schema.yaml index 49561be7..87217e24 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/linearity.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/linearity.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/linearity.schema" title: Linearity correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml index 6a548e0c..414f2f05 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mask.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mask.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/miri_ifucubepars.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/miri_ifucubepars.schema.yaml index 079db098..947f1239 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/miri_ifucubepars.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/miri_ifucubepars.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/miri_ifucubepars.schema" title: Default MIRI IFU cube parameters data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/miri_mrsptcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/miri_mrsptcorr.schema.yaml index 7ed5def1..8f1a0a61 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/miri_mrsptcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/miri_mrsptcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/miri_mrsptcorr.schema" title: MIRI IFU Point Source Spectral Corrections allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/miri_mrsxartcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/miri_mrsxartcorr.schema.yaml index 53a7986c..baf1fc8d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/miri_mrsxartcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/miri_mrsxartcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/miri_mrsxartcorr.schema" title: MIRI MRS Cross Artifact Corrections allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/miri_resolution.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/miri_resolution.schema.yaml index 8db9c63d..7f4ae47c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/miri_resolution.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/miri_resolution.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/miri_resolution.schema" title: Miri Resolution Reference file allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirimg_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirimg_apcorr.schema.yaml index 952f97f6..25675df1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirimg_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirimg_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirimg_apcorr.schema" title: MIRI imaging aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirimg_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirimg_photom.schema.yaml index d7d3384e..a26cb78f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirimg_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirimg_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirimg_photom.schema" title: MIRI imaging photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_apcorr.schema.yaml index f9fe39d4..5ec44c7b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirlrs_apcorr.schema" title: MIRI LRS aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_pathloss.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_pathloss.schema.yaml index fe404a96..fc582ff3 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_pathloss.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_pathloss.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirlrs_pathloss.schema" title: MIRI LRS Pathloss correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_photom.schema.yaml index 0e069419..09b0e35a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirlrs_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirlrs_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirlrs_photom.schema" title: MIRI LRS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirmrs_extract1d.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirmrs_extract1d.schema.yaml index 1b64c17b..7dcf16d5 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirmrs_extract1d.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirmrs_extract1d.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirmrs_extract1d.schema" title: Default MIRI MRS extract 1d data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mirmrs_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mirmrs_photom.schema.yaml index fe950da5..b37bd4a0 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mirmrs_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mirmrs_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mirmrs_photom.schema" title: MIRI MRS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/moving_target.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/moving_target.schema.yaml index b9fdf907..9d3a454c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/moving_target.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/moving_target.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/moving_target.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mrs_multispec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mrs_multispec.schema.yaml index 667de222..084d7bd8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mrs_multispec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mrs_multispec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mrs_multispec.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/mrs_spec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mrs_spec.schema.yaml index 877e9cba..5702fe11 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mrs_spec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mrs_spec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mrs_spec.schema" title: Spectrum data model with residual fringe correction for MIRI MRS allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/mrs_spectable.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/mrs_spectable.schema.yaml index ca08977e..fc85b985 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/mrs_spectable.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/mrs_spectable.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/mrs_spectable.schema" title: Extracted spectral data table with residual fringe correction for MIRI MRS fits_hdu: EXTRACT1D diff --git a/src/stdatamodels/jwst/datamodels/schemas/msatargacq.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/msatargacq.schema.yaml index 4e9ca95a..4220a1a4 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/msatargacq.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/msatargacq.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/msatargacq.schema" allOf: - type: object diff --git a/src/stdatamodels/jwst/datamodels/schemas/multicombinedspec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multicombinedspec.schema.yaml index 3f167744..16a281f9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multicombinedspec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multicombinedspec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/multicombinedspec.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/multiexposure.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multiexposure.schema.yaml index df2342e3..fc13cad8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multiexposure.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multiexposure.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/multiexposure.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml index afca47d1..97938864 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multiextract1d.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/multiextract1d.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/multislit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multislit.schema.yaml index e6437eab..324c944c 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multislit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multislit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/multislit.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml index 2cd71efd..9b044fae 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/multispec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/multispec.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_ifu.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_ifu.schema.yaml index a5ab4083..e16dec51 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_ifu.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_ifu.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_area_ifu.schema" title: NIRSpec IFU pixel area data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_mos.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_mos.schema.yaml index dfbdf31f..af8117b4 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_mos.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_mos.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_area_mos.schema" title: NIRSpec MOS pixel area data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_slit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_slit.schema.yaml index 22109a37..e2594121 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_slit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_area_slit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_area_slit.schema" title: NIRSpec fixed-slit pixel area data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_flat.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_flat.schema.yaml index 981a6f31..b516b621 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_flat.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_flat.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_flat.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_ifucubepars.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_ifucubepars.schema.yaml index d2c19de7..bafe588f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_ifucubepars.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_ifucubepars.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_ifucubepars.schema" title: Default NIRSPEC IFU cube parameters data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nirspec_quad_flat.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nirspec_quad_flat.schema.yaml index 88fb0ad5..3ce16998 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nirspec_quad_flat.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nirspec_quad_flat.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nirspec_quad_flat.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/nisimg_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nisimg_apcorr.schema.yaml index 6ed67cb1..c70a055f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nisimg_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nisimg_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nisimg_apcorr.schema" title: NIRISS imaging aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nisimg_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nisimg_photom.schema.yaml index 8886e88b..7eef1d45 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nisimg_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nisimg_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nisimg_photom.schema" title: NIRISS imaging photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nissoss_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nissoss_photom.schema.yaml index c1274ad3..7d8305c8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nissoss_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nissoss_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nissoss_photom.schema" title: NIRISS SOSS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/niswfss_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/niswfss_apcorr.schema.yaml index 35d36db0..22fa208a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/niswfss_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/niswfss_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/niswfss_apcorr.schema" title: NIRISS Wide Field Slitless Spectroscopy aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/niswfss_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/niswfss_photom.schema.yaml index 677aa90f..429c5666 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/niswfss_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/niswfss_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/niswfss_photom.schema" title: NIRISS WFSS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrcimg_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrcimg_apcorr.schema.yaml index ffa3e296..e865e2e3 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrcimg_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrcimg_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrcimg_apcorr.schema" title: NIRCam imaging aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrcimg_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrcimg_photom.schema.yaml index c8348cf5..b293e5d2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrcimg_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrcimg_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrcimg_photom.schema" title: NIRCam imaging photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_apcorr.schema.yaml index 10e9c814..93e09147 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrcwfss_apcorr.schema" title: NIRCam Wide Field Slitless Spectroscopy aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_photom.schema.yaml index 2ec070c4..37d4053a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrcwfss_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrcwfss_photom.schema" title: NIRCam WFSS photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrm.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrm.schema.yaml index 367b4261..26be0e05 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrm.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrm.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrm.schema" title: Non-Redundant Mask data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrsfs_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrsfs_apcorr.schema.yaml index af80f0ba..9da8b1d9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrsfs_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrsfs_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrsfs_apcorr.schema" title: NIRSpec Fixed Slit aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrsfs_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrsfs_photom.schema.yaml index 4d200336..5a366f2f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrsfs_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrsfs_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrsfs_photom.schema" title: NIRSpec Fixed-Slit photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrsmos_apcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrsmos_apcorr.schema.yaml index 093eb69c..f6ad2248 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrsmos_apcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrsmos_apcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrsmos_apcorr.schema" title: NIRSpec MOS and IFU aperture correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/nrsmos_photom.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/nrsmos_photom.schema.yaml index 8eba54fc..38626436 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/nrsmos_photom.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/nrsmos_photom.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/nrsmos_photom.schema" title: NIRSpec MOS and IFU photometric flux conversion data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml index b6db07d1..0f0f234d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/oifits.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/oifits.schema" title: OIFITS required meta data (not otherwise defined in core.schema) description: | diff --git a/src/stdatamodels/jwst/datamodels/schemas/outlierifuoutput.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/outlierifuoutput.schema.yaml index d02ba9ac..497ef9f2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/outlierifuoutput.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/outlierifuoutput.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/outlierifuoutput.schema" title: IFU Outlier detection optional arrays allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/outlierpars.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/outlierpars.schema.yaml index a8c34507..094657f1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/outlierpars.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/outlierpars.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/outlierpars.schema" title: Default Outlier Detection parameters data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/pastasossmodel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/pastasossmodel.schema.yaml index 65f74df9..ca826226 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/pastasossmodel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/pastasossmodel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/pastasossmodel.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/pathloss.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/pathloss.schema.yaml index 985c402b..f5b9b791 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/pathloss.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/pathloss.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/pathloss.schema" title: Pathloss correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/pathlosscorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/pathlosscorr.schema.yaml index 10871045..f12f5541 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/pathlosscorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/pathlosscorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/pathlosscorr.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/persat.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/persat.schema.yaml index 2410ed3b..e6799be1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/persat.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/persat.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/persat.schema" title: Persistence saturation threshold allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/photomcorr.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/photomcorr.schema.yaml index 77496a10..509651e1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/photomcorr.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/photomcorr.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/photomcorr.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/photometry.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/photometry.schema.yaml index d0c2f57c..3a966260 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/photometry.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/photometry.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/photometry.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/pixelarea.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/pixelarea.schema.yaml index 9916f3de..634e24d8 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/pixelarea.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/pixelarea.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/pixelarea.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/psfmask.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/psfmask.schema.yaml index 45c7212f..2cc3976b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/psfmask.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/psfmask.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/psfmask.schema" title: Coronagraphic PSF mask data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/quad.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/quad.schema.yaml index ce9a880c..026408f2 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/quad.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/quad.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/quad.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/ramp.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/ramp.schema.yaml index bc3625d8..4577d406 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/ramp.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/ramp.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/ramp.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/rampfitoutput.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/rampfitoutput.schema.yaml index c6b5cfb9..6bd99f34 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/rampfitoutput.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/rampfitoutput.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/rampfitoutput.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml index 25f23f76..c2c9185a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/readnoise.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/readnoise.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/referencecube.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/referencecube.schema.yaml index cd4511ec..d37279c5 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/referencecube.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/referencecube.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/referencecube.schema" title: Reference cube data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/referencefile.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/referencefile.schema.yaml index d3abb7c4..4d9d8a1b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/referencefile.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/referencefile.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/referencefile.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/referenceimage.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/referenceimage.schema.yaml index 9a9cf4b1..68988f8b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/referenceimage.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/referenceimage.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/referenceimage.schema" title: Reference image data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/referencequad.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/referencequad.schema.yaml index a1cc71a2..dd0f50e9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/referencequad.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/referencequad.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/referencequad.schema" title: Reference quad data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/reset.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/reset.schema.yaml index 887d81ee..1e431f19 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/reset.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/reset.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/reset.schema" title: Reset Correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/resolution.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/resolution.schema.yaml index e933fe63..5e3f85a0 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/resolution.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/resolution.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/resolution.schema" title: Default Resolution Reference file allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/rscd.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/rscd.schema.yaml index 0f34f9e6..24c91eea 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/rscd.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/rscd.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/rscd.schema" title: RSCD reference file model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/saturation.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/saturation.schema.yaml index 2c5df44a..0c538fa3 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/saturation.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/saturation.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/saturation.schema" title: Saturation checking data allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/segmap.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/segmap.schema.yaml index de176f04..4db92e4d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/segmap.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/segmap.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/segmap.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/slit.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slit.schema.yaml index 4eca25c7..43d65ccc 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slit.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slit.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/slit.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/slitdata.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slitdata.schema.yaml index ce756734..a95b26c9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slitdata.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slitdata.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/slitdata.schema" allOf: - type: object diff --git a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml index a2c09482..7ef6ed3f 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/slitmeta.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/slitmeta.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/sossextractmodel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/sossextractmodel.schema.yaml index 438b14e8..2d6d58e1 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/sossextractmodel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/sossextractmodel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/sossextractmodel.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/sosswavegrid.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/sosswavegrid.schema.yaml index faca0424..d3115fa9 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/sosswavegrid.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/sosswavegrid.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/sosswavegrid.schema" allOf: - $ref: core.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/spec.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/spec.schema.yaml index 03ad2677..74b70c8d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/spec.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/spec.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/spec.schema" title: Spectrum data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/speckernel.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/speckernel.schema.yaml index d5f94fb5..bc7e7653 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/speckernel.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/speckernel.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/speckernel.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/specmeta.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/specmeta.schema.yaml index d17fecf8..8f607e24 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/specmeta.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/specmeta.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/specmeta.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/specprofile.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/specprofile.schema.yaml index a52a12ae..0a40231d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/specprofile.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/specprofile.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/specprofile.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/specprofilesingle.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/specprofilesingle.schema.yaml index b5872ee7..717e4cd0 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/specprofilesingle.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/specprofilesingle.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/specprofilesingle.schema" title: Spectral profile data allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/specpsf.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/specpsf.schema.yaml index 444018d4..a22a784e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/specpsf.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/specpsf.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/specpsf.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/spectable.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/spectable.schema.yaml index e699412b..26c7abff 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/spectable.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/spectable.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/spectable.schema" title: Extracted spectral data table fits_hdu: EXTRACT1D diff --git a/src/stdatamodels/jwst/datamodels/schemas/spectrace.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/spectrace.schema.yaml index 5dd3c3b7..3c16745a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/spectrace.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/spectrace.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/spectrace.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/spectracesingle.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/spectracesingle.schema.yaml index 0af915f8..3a3c706b 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/spectracesingle.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/spectracesingle.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/spectracesingle.schema" title: Spectral trace data allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/spectracetable.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/spectracetable.schema.yaml index 9afe597e..f303212e 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/spectracetable.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/spectracetable.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/spectracetable.schema" title: Spectral trace table fits_hdu: ORDER diff --git a/src/stdatamodels/jwst/datamodels/schemas/straylight.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/straylight.schema.yaml index fd8d0710..981a984d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/straylight.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/straylight.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/straylight.schema" title: Straylight MRS correction data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/subarray.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/subarray.schema.yaml index f0c3a85a..4e35e372 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/subarray.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/subarray.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/subarray.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml index b8247c1e..8c58dcea 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/superbias.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/superbias.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/throughput.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/throughput.schema.yaml index 8fc043d0..fc471e3a 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/throughput.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/throughput.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/throughput.schema" title: Filter throughput data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/trapdensity.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/trapdensity.schema.yaml index 64dac61d..7cff776d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/trapdensity.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/trapdensity.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/trapdensity.schema" title: Trap density map allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/trappars.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/trappars.schema.yaml index 7b9826c1..01de12c3 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/trappars.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/trappars.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/trappars.schema" title: TrapPars data model allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/trapsfilled.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/trapsfilled.schema.yaml index cbe84137..2002be4d 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/trapsfilled.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/trapsfilled.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/trapsfilled.schema" title: Traps-filled map allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/tsophot.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/tsophot.schema.yaml index d06513a3..6c585006 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/tsophot.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/tsophot.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/tsophot.schema" title: TSO image photometry reference file model (tso_photometry step) allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/variance.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/variance.schema.yaml index 1d40e2cc..a24f46cf 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/variance.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/variance.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/variance.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/wavemap.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wavemap.schema.yaml index c14b9fa8..6b331437 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wavemap.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wavemap.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/wavemap.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/schemas/wavemapsingle.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wavemapsingle.schema.yaml index 40b89074..1743c535 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wavemapsingle.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wavemapsingle.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/wavemapsingle.schema" title: Wavelength map data allOf: diff --git a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml index ee6f2d55..a0c678df 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wcsinfo.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/wcsinfo.schema" type: object properties: diff --git a/src/stdatamodels/jwst/datamodels/schemas/wfssbkg.schema.yaml b/src/stdatamodels/jwst/datamodels/schemas/wfssbkg.schema.yaml index f1a48ca0..51da3949 100644 --- a/src/stdatamodels/jwst/datamodels/schemas/wfssbkg.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/schemas/wfssbkg.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" id: "http://stsci.edu/schemas/jwst_datamodel/wfssbkg.schema" allOf: - $ref: referencefile.schema diff --git a/src/stdatamodels/jwst/datamodels/tests/data/nonstandard_primary_array.schema.yaml b/src/stdatamodels/jwst/datamodels/tests/data/nonstandard_primary_array.schema.yaml index 46884f0f..595a7bd0 100644 --- a/src/stdatamodels/jwst/datamodels/tests/data/nonstandard_primary_array.schema.yaml +++ b/src/stdatamodels/jwst/datamodels/tests/data/nonstandard_primary_array.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" allOf: - $ref: http://stsci.edu/schemas/jwst_datamodel/core.schema - type: object diff --git a/src/stdatamodels/jwst/datamodels/tests/test_integration.py b/src/stdatamodels/jwst/datamodels/tests/test_integration.py index 2438b566..15bb6692 100644 --- a/src/stdatamodels/jwst/datamodels/tests/test_integration.py +++ b/src/stdatamodels/jwst/datamodels/tests/test_integration.py @@ -8,10 +8,6 @@ import stdatamodels.schema -METASCHEMAS = list( - importlib.resources.files("stdatamodels.jwst.datamodels.metaschema").glob("*.yaml") -) - DATAMODEL_SCHEMAS = list( importlib.resources.files("stdatamodels.jwst.datamodels.schemas").glob("*.yaml") ) @@ -24,7 +20,7 @@ ).glob("**/*.yaml") ) -SCHEMAS = METASCHEMAS + DATAMODEL_SCHEMAS + TRANSFORM_SCHEMAS +SCHEMAS = DATAMODEL_SCHEMAS + TRANSFORM_SCHEMAS TRANSFORM_MANIFESTS = list( importlib.resources.files("stdatamodels.jwst.transforms.resources.manifests").glob( @@ -49,7 +45,7 @@ def datamodel_associated_schemas(): @pytest.mark.parametrize("resource", RESOURCES) def test_resource_id(resource): """ - Test that all "resources" (schemas, metaschemas and manifests) are + Test that all "resources" (schemas, and manifests) are registered with asdf using the "id" in the resource. """ with open(resource, "rb") as f: diff --git a/tests/data/nonstandard_primary_array.schema.yaml b/tests/data/nonstandard_primary_array.schema.yaml index 46884f0f..595a7bd0 100644 --- a/tests/data/nonstandard_primary_array.schema.yaml +++ b/tests/data/nonstandard_primary_array.schema.yaml @@ -1,6 +1,6 @@ %YAML 1.1 --- -$schema: "http://stsci.edu/schemas/fits-schema/fits-schema" +$schema: "http://stsci.edu/schemas/asdf/asdf-schema-1.1.0" allOf: - $ref: http://stsci.edu/schemas/jwst_datamodel/core.schema - type: object diff --git a/tests/test_fits.py b/tests/test_fits.py index 7043e2c2..16574220 100644 --- a/tests/test_fits.py +++ b/tests/test_fits.py @@ -289,7 +289,7 @@ def test_table_with_unsigned_int(tmp_path): schema = { 'title': 'Test data model', - '$schema': 'http://stsci.edu/schemas/fits-schema/fits-schema', + '$schema': 'http://stsci.edu/schemas/asdf/asdf-schema-1.1.0', 'type': 'object', 'properties': { 'meta': { @@ -632,7 +632,7 @@ def test_table_linking(tmp_path): schema = { 'title': 'Test data model', - '$schema': 'http://stsci.edu/schemas/fits-schema/fits-schema', + '$schema': 'http://stsci.edu/schemas/asdf/asdf-schema-1.1.0', 'type': 'object', 'properties': { 'meta': {