Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/893.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unnecessary subcategory enum from program and l3_common schemas.
4 changes: 2 additions & 2 deletions latest/forced_image_source_catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-2.1.0

title: Forced source catalog generated from a Level 2 file by the Source Catalog Step.

Expand All @@ -10,7 +10,7 @@ datamodel_name: ForcedImageSourceCatalogModel
type: object
properties:
meta:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.1.0
source_catalog:
title: Source Catalog
description: |
Expand Down
4 changes: 2 additions & 2 deletions latest/forced_mosaic_source_catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-2.1.0

title: Forced source catalog generated from a Level 3 file by the Source Catalog Step.

Expand All @@ -11,7 +11,7 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0
- properties:
association:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_association-2.0.0
Expand Down
4 changes: 2 additions & 2 deletions latest/image_source_catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-2.1.0

title: Source catalog generated from a Level 2 file by the Source Catalog Step.

Expand All @@ -11,7 +11,7 @@ archive_meta: Science WFI Level 4 Source Catalog L2 Product
type: object
properties:
meta:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.1.0
source_catalog:
title: Source Catalog
description: |
Expand Down
60 changes: 30 additions & 30 deletions latest/manifests/datamodels.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
id: asdf://stsci.edu/datamodels/roman/manifests/datamodels-2.0.0
extension_uri: asdf://stsci.edu/datamodels/roman/extensions/datamodels-2.0.0
id: asdf://stsci.edu/datamodels/roman/manifests/datamodels-2.1.0
extension_uri: asdf://stsci.edu/datamodels/roman/extensions/datamodels-2.1.0
title: Datamodels extension
description: |-
A set of tags for serializing STScI Roman datamodels.
Expand All @@ -19,28 +19,28 @@ tags:
title: Level 1 Detector Guide Star Window Information schema
description: |-
Level 1 Detector Guide Star Window Information schema
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ramp-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ramp-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ramp-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ramp-2.1.0
title: Ramp schema
description: |-
Ramp schema
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_science_raw-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_science_raw-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_science_raw-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_science_raw-2.1.0
title: Roman WFI Raw Science Data datamodel
description: |-
Basic Roman Raw Science
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_image-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_image-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_image-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_image-2.1.0
title: Wfi level 2 image information
description: |-
Wfi level 2 image information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_mosaic-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_mosaic-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_mosaic-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_mosaic-2.1.0
title: Wfi level 3 mosaic information
description: |-
Wfi level 3 mosaic information
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_wcs-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_wcs-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_wcs-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_wcs-2.1.0
title: Roman Wide Field Instrument (WFI) Level 2 (L2) WCS
description: |-
Roman Wide Field Instrument (WFI) Level 2 (L2) WCS and
Expand Down Expand Up @@ -163,49 +163,49 @@ tags:
description: |-
Multiple Accumulation Table Reference File Schema
# Misc
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/image_source_catalog-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/image_source_catalog-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-2.1.0
title: Image source catalog
description: |-
Photometry and astrometry computed by the Source Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/segmentation_map-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/segmentation_map-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-2.1.0
title: Segmentation map
description: |-
Segmentation map computed by the Source Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_source_catalog-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_source_catalog-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-2.1.0
title: Mosaic source catalog
description: |-
Photometry and astrometry computed by the Source Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/multiband_source_catalog-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/multiband_source_catalog-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/multiband_source_catalog-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/multiband_source_catalog-2.1.0
title: Multiband source catalog
description: |-
Photometry and astrometry computed by the Multiband Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_segmentation_map-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_segmentation_map-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-2.1.0
title: Mosaic segmentation map
description: |-
Segmentation map computed by the Source Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/multiband_segmentation_map-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/multiband_segmentation_map-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/multiband_segmentation_map-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/multiband_segmentation_map-2.1.0
title: Multiband segmentation map
description: |-
Segmentation map computed by the Multiband Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/forced_image_source_catalog-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/forced_image_source_catalog-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-2.1.0
title: Forced image source catalog
description: |-
Photometry and astrometry computed by the Source Catalog Step
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/forced_mosaic_source_catalog-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/forced_mosaic_source_catalog-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-2.1.0
title: Forced mosaic source catalog
description: |-
Photometry and astrometry computed by the Source Catalog Step
# SSC data models
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/msos_stack-2.0.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/msos_stack-2.0.0
- tag_uri: asdf://stsci.edu/datamodels/roman/tags/msos_stack-2.1.0
schema_uri: asdf://stsci.edu/datamodels/roman/schemas/msos_stack-2.1.0
title: MSOS Stack Level 3 Schema
description: |-
Level 3 schema for SSC's MSOS stack products
4 changes: 2 additions & 2 deletions latest/meta/common.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/common-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/common-2.1.0

title: Common metadata properties

Expand All @@ -26,7 +26,7 @@ allOf:
pointing:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/pointing-2.0.0
program:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.1.0
ref_file:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/ref_file-2.0.0
rcs:
Expand Down
4 changes: 2 additions & 2 deletions latest/meta/l2_catalog_common.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l2_catalog_common-2.1.0

title: Common Level 2 Catalog Metadata

Expand All @@ -24,7 +24,7 @@ allOf:
pointing:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/pointing-2.0.0
program:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.1.0
ref_file:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/ref_file-2.0.0
visit:
Expand Down
4 changes: 2 additions & 2 deletions latest/meta/l3_catalog_common.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0

title: Common Level 3 Catalog Metadata

allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.1.0
- properties:
image:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/catalog_image-2.0.0
Expand Down
16 changes: 1 addition & 15 deletions latest/meta/l3_common.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.1.0

title: Common Level 3 Metadata

Expand Down Expand Up @@ -424,20 +424,6 @@ properties:
the meta.program.category values.
anyOf:
- type: string
enum:
[
"CAL",
"CGI",
"CR",
"DR",
"GBTD",
"HLTD",
"HLWA",
"OR",
"WFI",
"WFSC",
"None",
]
- type: "null"
archive_catalog:
datatype: nvarchar(15)
Expand Down
16 changes: 1 addition & 15 deletions latest/meta/program.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/meta/program-2.1.0

title: Program Information
type: object
Expand Down Expand Up @@ -80,20 +80,6 @@ properties:
and Control (WFSC). All subcategories belong to only a subset of
the meta.program.category values.
type: string
enum:
[
"CAL",
"CGI",
"CR",
"DR",
"GBTD",
"HLTD",
"HLWA",
"OR",
"WFI",
"WFSC",
"None",
]
sdf:
special_processing: VALUE_REQUIRED
source:
Expand Down
4 changes: 2 additions & 2 deletions latest/mosaic_segmentation_map.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-2.1.0

title: Segmentation map generated from a Level 3 file by the Source Catalog Step.

Expand All @@ -12,7 +12,7 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0
- properties:
association:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_association-2.0.0
Expand Down
4 changes: 2 additions & 2 deletions latest/mosaic_source_catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-2.1.0

title: Source catalog generated from a Level 3 file by the Source Catalog Step.

Expand All @@ -12,7 +12,7 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0
- properties:
association:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_association-2.0.0
Expand Down
4 changes: 2 additions & 2 deletions latest/msos_stack.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/msos_stack-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/msos_stack-2.1.0

title: |
MSOS Stack Level 3 Schema
Expand All @@ -12,7 +12,7 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/common-2.1.0
- type: object
properties:
image_list:
Expand Down
6 changes: 3 additions & 3 deletions latest/multiband_segmentation_map.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/multiband_segmentation_map-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/multiband_segmentation_map-2.1.0

title: Segmentation map generated from a Level 3 file by the Multiband Catalog Step.

Expand All @@ -12,12 +12,12 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0
- properties:
image_metas:
type: array
items:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.1.0
psf_match_reference_filter:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/enums/wfi_optical_element-2.0.0
Expand Down
6 changes: 3 additions & 3 deletions latest/multiband_source_catalog.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/multiband_source_catalog-2.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/multiband_source_catalog-2.1.0

title: Multiband source catalog generated from a Level 3 file by the Multiband Catalog Step.

Expand All @@ -12,12 +12,12 @@ type: object
properties:
meta:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.0.0
- $ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_catalog_common-2.1.0
- properties:
image_metas:
type: array
items:
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.0.0
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/l3_common-2.1.0
psf_match_reference_filter:
allOf:
- $ref: asdf://stsci.edu/datamodels/roman/schemas/enums/wfi_optical_element-2.0.0
Expand Down
Loading
Loading