Skip to content

Commit da422ca

Browse files
WilliamJamiesonWilliamJamieson
authored
RAD-216: Remove the use of the tagged scalars take 2 (#688)
2 parents b7f55fc + 93a8654 commit da422ca

153 files changed

Lines changed: 5805 additions & 428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎changes/688.feature.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove active use of the tagged scalars in the latest schemas.

‎latest/basic.yaml‎

Lines changed: 11 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,33 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
55

66
title: Basic Information
77

88
type: object
99
properties:
1010
# Meta Variables
1111
calibration_software_name:
12-
title: Calibration Software Name
13-
description: |
14-
Name of the calibration software package used in
15-
processing this file.
16-
tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_name-1.0.0
12+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/calibration_software_name-1.0.0
1713
calibration_software_version:
18-
title: Calibration Software Version Number
19-
description: |
20-
The version number of the calibration software used in processing this
21-
file.
22-
tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0
14+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/calibration_software_version-1.0.0
2315
product_type:
24-
title: Product Type Descriptor
25-
description: |
26-
A descriptor for the type of data contained within the
27-
file. This corresponds to the standard file suffixes for
28-
archival data products. Consult the documentation for the list
29-
of options.
30-
tag: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0
16+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/product_type-1.0.0
3117
filename:
32-
title: File Name
33-
description: |
34-
The auto-generated name of this file.
35-
tag: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0
18+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/filename-1.0.0
3619
file_date:
37-
title: File Creation Date
38-
description: |
39-
The date and time this file was created.
40-
tag: asdf://stsci.edu/datamodels/roman/tags/file_date-1.0.0
20+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/file_date-1.0.0
4121
model_type:
42-
title: Data Model Type
43-
description: |
44-
The type of data model contained within this file.
45-
tag: asdf://stsci.edu/datamodels/roman/tags/model_type-1.0.0
22+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/model_type-1.0.0
4623
origin:
47-
title: Institution / Organization Name
48-
description: |
49-
The name of the institution or organization
50-
responsible for creating this file.
51-
tag: asdf://stsci.edu/datamodels/roman/tags/origin-1.0.0
24+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/origin-1.0.0
5225
prd_version:
53-
title: SOC PRD Version Number
54-
description: |
55-
The version number of the Science Operations Center
56-
(SOC) Project Reference Database (PRD) used in generating this
57-
file.
58-
tag: asdf://stsci.edu/datamodels/roman/tags/prd_version-1.0.0
26+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/prd_version-1.0.0
5927
sdf_software_version:
60-
title: SOC SDF Version Number
61-
description: |
62-
The version number of the Science Operations Center
63-
(SOC) Science Data Formatting (SDF) software used in generating
64-
this file.
65-
tag: asdf://stsci.edu/datamodels/roman/tags/sdf_software_version-1.0.0
28+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/sdf_software_version-1.0.0
6629
telescope:
67-
title: Telescope Name
68-
description: |
69-
The name of the telescope used to acquire the data.
70-
tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0
30+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/telescope-1.0.0
7131
required:
7232
[
7333
calibration_software_name,

‎latest/common.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/common-1.3.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/common-1.4.0
55

66
title: Common metadata properties
77

88
allOf:
99
# Meta Variables
10-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
10+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1111
- type: object
1212
properties:
1313
# Meta Objects

‎latest/datamodels.yaml‎

Lines changed: 70 additions & 131 deletions
Large diffs are not rendered by default.

‎latest/forced_image_source_catalog.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-1.0.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/forced_image_source_catalog-1.1.0
55

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

@@ -12,7 +12,7 @@ type: object
1212
properties:
1313
meta:
1414
allOf:
15-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
15+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1616
- type: object
1717
properties:
1818
optical_element:

‎latest/forced_mosaic_source_catalog.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-1.0.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/forced_mosaic_source_catalog-1.1.0
55

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

@@ -12,11 +12,11 @@ type: object
1212
properties:
1313
meta:
1414
allOf:
15-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
15+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1616
- type: object
1717
properties:
1818
basic:
19-
tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.2.0
19+
tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.3.0
2020
photometry:
2121
title: Photometry Information
2222
tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0

‎latest/image_source_catalog.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-1.3.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/image_source_catalog-1.4.0
55

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

@@ -12,7 +12,7 @@ type: object
1212
properties:
1313
meta:
1414
allOf:
15-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
15+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1616
- type: object
1717
properties:
1818
optical_element:

‎latest/l1_detector_guidewindow.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/l1_detector_guidewindow-1.2.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/l1_detector_guidewindow-1.3.0
55

66
title: Level 1 Detector Guide Star Window Information
77

@@ -13,7 +13,7 @@ type: object
1313
properties:
1414
meta:
1515
allOf:
16-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
16+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1717
- type: object
1818
properties:
1919
instrument:

‎latest/l1_face_guidewindow.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/l1_face_guidewindow-1.2.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/l1_face_guidewindow-1.3.0
55

66
title: Level 1 FACE Guide Star Window Information schema
77

@@ -13,7 +13,7 @@ type: object
1313
properties:
1414
meta:
1515
allOf:
16-
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0
16+
- $ref: asdf://stsci.edu/datamodels/roman/schemas/basic-1.1.0
1717
- type: object
1818
properties:
1919
optical_element:

‎latest/l3_common.yaml‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
%YAML 1.1
22
---
33
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
4-
id: asdf://stsci.edu/datamodels/roman/schemas/l3_common-1.0.0
4+
id: asdf://stsci.edu/datamodels/roman/schemas/l3_common-1.1.0
55

66
title: Common Level 3 Metadata
77

88
type: object
99
properties:
1010
calibration_software_name:
11-
title: Calibration Software Name
12-
description: >
13-
Name of the calibration software package used in processing this file.
14-
tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_name-1.0.0
11+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/calibration_software_name-1.0.0
1512
calibration_software_version:
16-
title: Calibration Software Version Number
17-
description: >
18-
The version number or other identifier of the calibration software used in processing this file.
19-
tag: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0
13+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/calibration_software_version-1.0.0
2014
data_release_id:
2115
title: Data Release Identifier
2216
description: >
@@ -28,40 +22,17 @@ properties:
2822
datatype: nvarchar(120)
2923
destination: [WFIMosaic.data_release_id]
3024
filename:
31-
title: File Name
32-
description: >
33-
The auto-generated name of this file.
34-
tag: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0
25+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/filename-1.0.0
3526
file_date:
36-
title: File Creation Date
37-
description: >
38-
The date and time this file was created.
39-
tag: asdf://stsci.edu/datamodels/roman/tags/file_date-1.0.0
27+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/file_date-1.0.0
4028
model_type:
41-
title: Data Model Type
42-
description: >
43-
The type of data model contained within this file.
44-
tag: asdf://stsci.edu/datamodels/roman/tags/model_type-1.0.0
29+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/model_type-1.0.0
4530
origin:
46-
title: Institution / Organization Name
47-
description: >
48-
The name of the institution or organization
49-
responsible for creating this file.
50-
tag: asdf://stsci.edu/datamodels/roman/tags/origin-1.0.0
31+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/origin-1.0.0
5132
product_type:
52-
title: Product Type Descriptor
53-
description: >
54-
A descriptor of the type of data contained within this
55-
file. A string beginning with "p" indicates a prompt data product,
56-
while a string beginning with "r" indicates a data release product.
57-
For example, "p_visit_coadd" indicates a prompt data product
58-
containing a co-addition of exposures within a visit.
59-
tag: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0
33+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/product_type-1.0.0
6034
telescope:
61-
title: Telescope Name
62-
description: >
63-
The name of the telescope used to acquire the data.
64-
tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0
35+
$ref: asdf://stsci.edu/datamodels/roman/schemas/meta/telescope-1.0.0
6536

6637
cal_logs:
6738
title: Calibration Log Messages

0 commit comments

Comments
 (0)