Skip to content

Commit

Permalink
Remove fits metaschema (#378)
Browse files Browse the repository at this point in the history
  • Loading branch information
braingram authored Jan 23, 2025
1 parent 7798b8a commit b49f5f4
Show file tree
Hide file tree
Showing 172 changed files with 172 additions and 198 deletions.
1 change: 1 addition & 0 deletions changes/378.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove fits metaschema, use updated asdf metaschema.
4 changes: 2 additions & 2 deletions docs/source/jwst/datamodels/schemas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions src/stdatamodels/jwst/datamodels/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
)
]
Empty file.
19 changes: 0 additions & 19 deletions src/stdatamodels/jwst/datamodels/metaschema/fits-schema.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/ami.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/amilg.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/amioi.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/asn.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/bunit.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/cheby.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/core.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/cube.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/dark.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/flat.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/gain.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/group.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/image.schema.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/ipc.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/stdatamodels/jwst/datamodels/schemas/irs2.schema.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Loading

0 comments on commit b49f5f4

Please sign in to comment.