From 27e7520c8c56c8df0902b5ea41e13fd17177364b Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Wed, 14 Feb 2024 13:59:25 -0500 Subject: [PATCH 01/22] adding source catalog schema --- .../resources/manifests/datamodels-1.0.yaml | 5 +++++ .../schemas/source_catalog-1.0.0.yaml | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/rad/resources/schemas/source_catalog-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index cd9e2655..5cab23a1 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -268,6 +268,11 @@ tags: title: Calibration reference file names. description: |- Calibration reference file names. +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/source_catalog-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 + title: Source catalog + description: |- + Photometry and astrometry computed by the Source Catalog Step # Tagged Scalars - tag_uri: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/calibration_software_version-1.0.0 diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml new file mode 100644 index 00000000..7fdedf32 --- /dev/null +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -0,0 +1,20 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 + +title: Source catalog generated by the Source Catalog Step. +datamodel_name: SourceCatalogModel +archive_meta: None +type: object +properties: + source_catalog: + title: Source Catalog + description: | + Photometry and astrometry computed in the Source Catalog Step. + tag: tag:astropy.org:astropy/table/table-1.* + +required: [source_catalog] +flowStyle: block +propertyOrder: [source_catalog] +... From 5858bc8e42132ec93022ffcff377951a6804667e Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 4 Mar 2024 14:14:03 -0500 Subject: [PATCH 02/22] fix changelog --- CHANGES.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c3660d5e..92648b66 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -0.19.1 (unreleased) +0.20.0 (unreleased) ------------------- - Add new schemas to documentation. [#386] @@ -26,6 +26,7 @@ - Create the flux step schema. [#395] +- Add source_datalog and segmentation_map schemas. [#374] 0.19.0 (2024-02-09) ------------------- From 8d393a0be1fb89c0a0d20c59c8b633c5332ff520 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 19 Feb 2024 16:47:53 -0500 Subject: [PATCH 03/22] adding segmentation map schema --- .../resources/manifests/datamodels-1.0.yaml | 5 +++ .../schemas/segmentation_map-1.0.0.yaml | 32 +++++++++++++++++++ .../schemas/source_catalog-1.0.0.yaml | 7 ++-- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/rad/resources/schemas/segmentation_map-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 5cab23a1..03b3ed64 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -273,6 +273,11 @@ tags: title: Source catalog description: |- Photometry and astrometry computed by the Source Catalog Step +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/segmentation_map-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-1.0.0 + title: Segmentation map + description: |- + Segmentation map computed by the Source Catalog Step # Tagged Scalars - tag_uri: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/calibration_software_version-1.0.0 diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml new file mode 100644 index 00000000..bf3fed2f --- /dev/null +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -0,0 +1,32 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-1.0.0 + +title: Segmentation map generated by the Source Catalog Step. + +datamodel_name: SegmentationMapModel + +archive_meta: None +type: object +properties: + data: + title: Segmentation map + description: | + Segmentation map of an image model, zeros correspond to background. + tag: tag:stsci.edu:asdf/core/ndarray-1.* + ndim: 2 + datatype: uint32 + exact_datatype: true + meta: + anyOf: + - $ref: common-1.0.0 + - type: object + properties: + filename: + type: string + +required: [meta, data] +flowStyle: block +propertyOrder: [meta, data] +... diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 7fdedf32..97e2f84e 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -4,7 +4,9 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 title: Source catalog generated by the Source Catalog Step. + datamodel_name: SourceCatalogModel + archive_meta: None type: object properties: @@ -14,7 +16,8 @@ properties: Photometry and astrometry computed in the Source Catalog Step. tag: tag:astropy.org:astropy/table/table-1.* -required: [source_catalog] + +required: [meta, source_catalog] flowStyle: block -propertyOrder: [source_catalog] +propertyOrder: [meta, source_catalog] ... From 887a327b04366510061568dfbaaf870f3c18f0ec Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 20 Feb 2024 11:47:47 -0500 Subject: [PATCH 04/22] Update src/rad/resources/schemas/source_catalog-1.0.0.yaml Co-authored-by: William Jamieson --- src/rad/resources/schemas/source_catalog-1.0.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 97e2f84e..d21a97a0 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -17,7 +17,7 @@ properties: tag: tag:astropy.org:astropy/table/table-1.* -required: [meta, source_catalog] +required: [source_catalog] flowStyle: block -propertyOrder: [meta, source_catalog] +propertyOrder: [source_catalog] ... From e376842bb7aeaddd50f99e5a1d5df03363cdccec Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Thu, 22 Feb 2024 11:27:32 -0500 Subject: [PATCH 05/22] add meta to source catalog --- src/rad/resources/schemas/source_catalog-1.0.0.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index d21a97a0..07c62dbe 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -15,7 +15,13 @@ properties: description: | Photometry and astrometry computed in the Source Catalog Step. tag: tag:astropy.org:astropy/table/table-1.* - + meta: + anyOf: + - $ref: common-1.0.0 + - type: object + properties: + segmentation_map: + type: string required: [source_catalog] flowStyle: block From 5dd72071f00a7ae0272dc8246fa55f5093bd706f Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 27 Feb 2024 10:54:31 -0500 Subject: [PATCH 06/22] Update CHANGES.rst Co-authored-by: Nadia Dencheva --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 92648b66..67538849 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,6 +28,8 @@ - Add source_datalog and segmentation_map schemas. [#374] +- Added schema for Source Catalog and Segmentation Map. [#374] + 0.19.0 (2024-02-09) ------------------- From f1ddb4b79366ac993506705a9d9889907990f229 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 27 Feb 2024 10:54:37 -0500 Subject: [PATCH 07/22] Update src/rad/resources/schemas/segmentation_map-1.0.0.yaml Co-authored-by: Nadia Dencheva --- src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index bf3fed2f..6592248d 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -19,7 +19,7 @@ properties: datatype: uint32 exact_datatype: true meta: - anyOf: + allOf: - $ref: common-1.0.0 - type: object properties: From 1b72b7dc09e2b735d75328354ee43a2d72ff8d34 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 27 Feb 2024 11:01:29 -0500 Subject: [PATCH 08/22] Updates from Nadia's review comments --- .../schemas/segmentation_map-1.0.0.yaml | 10 +++++----- .../resources/schemas/source_catalog-1.0.0.yaml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 6592248d..94b3e572 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -20,11 +20,11 @@ properties: exact_datatype: true meta: allOf: - - $ref: common-1.0.0 - - type: object - properties: - filename: - type: string + - $ref: basic-1.0.0 + - $ref: coordinates-1.0.0 + - $ref: wfi_optical_element-1.0.0 + - $ref: program-1.0.0 + - $ref: visit-1.0.0 required: [meta, data] flowStyle: block diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 07c62dbe..688f57a1 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -16,14 +16,14 @@ properties: Photometry and astrometry computed in the Source Catalog Step. tag: tag:astropy.org:astropy/table/table-1.* meta: - anyOf: - - $ref: common-1.0.0 - - type: object - properties: - segmentation_map: - type: string + allOf: + - $ref: basic-1.0.0 + - $ref: coordinates-1.0.0 + - $ref: wfi_optical_element-1.0.0 + - $ref: program-1.0.0 + - $ref: visit-1.0.0 -required: [source_catalog] +required: [meta, source_catalog] flowStyle: block -propertyOrder: [source_catalog] +propertyOrder: [meta, source_catalog] ... From 8638e357df2e6ac944a855121fa64f0b17c97401 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 4 Mar 2024 14:13:24 -0500 Subject: [PATCH 09/22] fixing meta and binary block order --- CHANGES.rst | 2 -- .../resources/schemas/segmentation_map-1.0.0.yaml | 14 +++++++------- .../resources/schemas/source_catalog-1.0.0.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 67538849..92648b66 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,8 +28,6 @@ - Add source_datalog and segmentation_map schemas. [#374] -- Added schema for Source Catalog and Segmentation Map. [#374] - 0.19.0 (2024-02-09) ------------------- diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 94b3e572..81c2f4b1 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -10,6 +10,13 @@ datamodel_name: SegmentationMapModel archive_meta: None type: object properties: + meta: + allOf: + - $ref: basic-1.0.0 + - $ref: coordinates-1.0.0 + - $ref: wfi_optical_element-1.0.0 + - $ref: program-1.0.0 + - $ref: visit-1.0.0 data: title: Segmentation map description: | @@ -18,13 +25,6 @@ properties: ndim: 2 datatype: uint32 exact_datatype: true - meta: - allOf: - - $ref: basic-1.0.0 - - $ref: coordinates-1.0.0 - - $ref: wfi_optical_element-1.0.0 - - $ref: program-1.0.0 - - $ref: visit-1.0.0 required: [meta, data] flowStyle: block diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 688f57a1..ad019bfb 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -10,11 +10,6 @@ datamodel_name: SourceCatalogModel archive_meta: None type: object properties: - source_catalog: - title: Source Catalog - description: | - Photometry and astrometry computed in the Source Catalog Step. - tag: tag:astropy.org:astropy/table/table-1.* meta: allOf: - $ref: basic-1.0.0 @@ -22,6 +17,11 @@ properties: - $ref: wfi_optical_element-1.0.0 - $ref: program-1.0.0 - $ref: visit-1.0.0 + source_catalog: + title: Source Catalog + description: | + Photometry and astrometry computed in the Source Catalog Step. + tag: tag:astropy.org:astropy/table/table-1.* required: [meta, source_catalog] flowStyle: block From 99e49648d0412529fc74454f3955019354d73902 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Tue, 5 Mar 2024 12:44:54 -0500 Subject: [PATCH 10/22] tweaking metadata requirements --- .../schemas/segmentation_map-1.0.0.yaml | 16 +++++++++++----- .../schemas/source_catalog-1.0.0.yaml | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 81c2f4b1..dedc733f 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -12,11 +12,17 @@ type: object properties: meta: allOf: - - $ref: basic-1.0.0 - - $ref: coordinates-1.0.0 - - $ref: wfi_optical_element-1.0.0 - - $ref: program-1.0.0 - - $ref: visit-1.0.0 + - type: object + properties: + basic: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + coordinates: + tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 + program: + tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 + wcsinfo: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 + required: [basic, coordinates, program, wcsinfo] data: title: Segmentation map description: | diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index ad019bfb..0955436b 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -12,11 +12,19 @@ type: object properties: meta: allOf: - - $ref: basic-1.0.0 - - $ref: coordinates-1.0.0 - - $ref: wfi_optical_element-1.0.0 - - $ref: program-1.0.0 - - $ref: visit-1.0.0 + - type: object + properties: + basic: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + coordinates: + tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 + photometry: + tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 + program: + tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 + wcsinfo: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 + required: [basic, coordinates, photometry, program, wcsinfo] source_catalog: title: Source Catalog description: | From 90d43b6c535a6c0e6c9be0c4d439863050c57ae6 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 13 Mar 2024 13:43:46 -0400 Subject: [PATCH 11/22] this will be L3 schema --- src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index dedc733f..3234d46a 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -12,6 +12,7 @@ type: object properties: meta: allOf: + - $ref: basic-1.0.0 - type: object properties: basic: From 102d666597358179ba550eb387b4b12258e1d709 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Sat, 16 Mar 2024 09:04:25 -0400 Subject: [PATCH 12/22] add mosaic_source_catalog and mosaic_segmentation_map --- .../resources/manifests/datamodels-1.0.yaml | 10 +++++ .../mosaic_segmentation_map-1.0.0.yaml | 37 +++++++++++++++++++ .../schemas/mosaic_source_catalog-1.0.0.yaml | 36 ++++++++++++++++++ .../schemas/segmentation_map-1.0.0.yaml | 6 +-- .../schemas/source_catalog-1.0.0.yaml | 7 ++-- 5 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml create mode 100644 src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 03b3ed64..1d6920e7 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -278,6 +278,16 @@ tags: title: Segmentation map description: |- Segmentation map computed by the Source Catalog Step +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_source_catalog-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-1.0.0 + title: Source catalog + description: |- + Photometry and astrometry computed by the Source Catalog Step +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_segmentation_map-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-1.0.0 + title: Segmentation map + description: |- + Segmentation map computed by the Source Catalog Step # Tagged Scalars - tag_uri: asdf://stsci.edu/datamodels/roman/tags/calibration_software_version-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tagged_scalars/calibration_software_version-1.0.0 diff --git a/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml new file mode 100644 index 00000000..b087038f --- /dev/null +++ b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml @@ -0,0 +1,37 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-1.0.0 + +title: Segmentation map generated from a Level 3 file by the Source Catalog Step. + +datamodel_name: MosaicSegmentationMapModel + +archive_meta: None +type: object +properties: + meta: + allOf: + - $ref: basic-1.0.0 + - type: object + properties: + basic: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + coordinates: + tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 + program: + tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 + required: [basic, coordinates, program] + data: + title: Segmentation map + description: | + Segmentation map of an image model, zeros correspond to background. + tag: tag:stsci.edu:asdf/core/ndarray-1.* + ndim: 2 + datatype: uint32 + exact_datatype: true + +required: [meta, data] +flowStyle: block +propertyOrder: [meta, data] +... diff --git a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml new file mode 100644 index 00000000..048719ec --- /dev/null +++ b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml @@ -0,0 +1,36 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-1.0.0 + +title: Source catalog generated from a Level 3 file by the Source Catalog Step. + +datamodel_name: MosaicSourceCatalogModel + +archive_meta: None +type: object +properties: + meta: + allOf: + - $ref: basic-1.0.0 + - type: object + properties: + basic: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + coordinates: + tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 + photometry: + tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 + program: + tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 + required: [basic, coordinates, photometry, program] + source_catalog: + title: Source Catalog + description: | + Photometry and astrometry computed in the Source Catalog Step. + tag: tag:astropy.org:astropy/table/table-1.* + +required: [meta, source_catalog] +flowStyle: block +propertyOrder: [meta, source_catalog] +... diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 3234d46a..dc2a05e5 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -3,7 +3,7 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-1.0.0 -title: Segmentation map generated by the Source Catalog Step. +title: Segmentation map generated from a Level 3 file by the Source Catalog Step. datamodel_name: SegmentationMapModel @@ -21,9 +21,7 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - wcsinfo: - tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 - required: [basic, coordinates, program, wcsinfo] + required: [basic, coordinates, program] data: title: Segmentation map description: | diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 0955436b..84ed5f70 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -3,7 +3,7 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 -title: Source catalog generated by the Source Catalog Step. +title: Source catalog generated from a Level 3 file by the Source Catalog Step. datamodel_name: SourceCatalogModel @@ -12,6 +12,7 @@ type: object properties: meta: allOf: + - $ref: basic-1.0.0 - type: object properties: basic: @@ -22,9 +23,7 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - wcsinfo: - tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 - required: [basic, coordinates, photometry, program, wcsinfo] + required: [basic, coordinates, photometry, program] source_catalog: title: Source Catalog description: | From f28af2889b8db6831686e8b656539871f0c45950 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Mon, 18 Mar 2024 11:59:27 -0400 Subject: [PATCH 13/22] L2 catalogs and segmentation maps --- docs/creating.rst | 9 +++++++++ src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 10 ++++++---- src/rad/resources/schemas/source_catalog-1.0.0.yaml | 10 +++++----- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/docs/creating.rst b/docs/creating.rst index 338e8f89..bca1a19b 100644 --- a/docs/creating.rst +++ b/docs/creating.rst @@ -386,6 +386,15 @@ actually functions; meaning that for ASDF 3.0+ to correctly handle the schema without issues, the ``allOf`` combiner is necessary, see `PR 222 `_ for more details. +Testing Schemas +--------------- + +Once you created a schema, run the tests in the ``rad`` package before proceeding +to write the model. + +.. note:: + The schemas need to be committed to the working repository and the ``rad`` + package needs to be installed before running the tests. Creating a Data Model --------------------- diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index dc2a05e5..551798b4 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -3,7 +3,7 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/segmentation_map-1.0.0 -title: Segmentation map generated from a Level 3 file by the Source Catalog Step. +title: Segmentation map generated from a Level 2 file by the Source Catalog Step. datamodel_name: SegmentationMapModel @@ -15,13 +15,15 @@ properties: - $ref: basic-1.0.0 - type: object properties: - basic: - tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + optical_element: + tag: asdf://stsci.edu/datamodels/roman/tags/wfi_optical_element-1.0.0 coordinates: tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - required: [basic, coordinates, program] + visit: + tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 + required: [optical_element, coordinates, program, visit] data: title: Segmentation map description: | diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 84ed5f70..a5fa64ce 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -15,15 +15,15 @@ properties: - $ref: basic-1.0.0 - type: object properties: - basic: - tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + optical_element: + tag: asdf://stsci.edu/datamodels/roman/tags/wfi_optical_element-1.0.0 coordinates: tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 - photometry: - tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - required: [basic, coordinates, photometry, program] + visit: + tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 + required: [optical_element, coordinates, program, visit] source_catalog: title: Source Catalog description: | From 31e55497c5f651440615a392be18b9339379d23b Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Mon, 18 Mar 2024 12:03:10 -0400 Subject: [PATCH 14/22] add optical_element --- src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 5 ++++- src/rad/resources/schemas/source_catalog-1.0.0.yaml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 551798b4..acd88582 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -16,7 +16,10 @@ properties: - type: object properties: optical_element: - tag: asdf://stsci.edu/datamodels/roman/tags/wfi_optical_element-1.0.0 + title: WFI Optical Element + description: | + WFI optical element used to take the data. + $ref: wfi_optical_element-1.0.0 coordinates: tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index a5fa64ce..fe4e5dde 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -16,7 +16,10 @@ properties: - type: object properties: optical_element: - tag: asdf://stsci.edu/datamodels/roman/tags/wfi_optical_element-1.0.0 + title: WFI Optical Element + description: | + WFI optical element used to take the data. + $ref: wfi_optical_element-1.0.0 coordinates: tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: From fc60e553e1e18faa3d8e8c182003a16dbdb0a7a3 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Mon, 18 Mar 2024 15:34:42 -0400 Subject: [PATCH 15/22] add change log entry --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 92648b66..ab4ac45b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,6 +28,8 @@ - Add source_datalog and segmentation_map schemas. [#374] +Add source_catalog and segmentation_map schemas for Level 2 and Level 3 files. [#393] + 0.19.0 (2024-02-09) ------------------- From 047aa7ea7996f13dab78c5e12643e9ea3662973a Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Mon, 25 Mar 2024 13:02:40 -0400 Subject: [PATCH 16/22] address comments --- src/rad/resources/manifests/datamodels-1.0.yaml | 4 ++-- src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml | 4 +--- src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml | 4 +--- src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 4 +--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 1d6920e7..dcf29b89 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -280,12 +280,12 @@ tags: Segmentation map computed by the Source Catalog Step - tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_source_catalog-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_source_catalog-1.0.0 - title: Source catalog + title: Mosaic source catalog description: |- Photometry and astrometry computed by the Source Catalog Step - tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_segmentation_map-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_segmentation_map-1.0.0 - title: Segmentation map + title: Mosaic segmentation map description: |- Segmentation map computed by the Source Catalog Step # Tagged Scalars diff --git a/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml index b087038f..2f3d78df 100644 --- a/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml @@ -17,11 +17,9 @@ properties: properties: basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 - coordinates: - tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - required: [basic, coordinates, program] + required: [basic, program] data: title: Segmentation map description: | diff --git a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml index 048719ec..e068fccb 100644 --- a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml @@ -17,13 +17,11 @@ properties: properties: basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 - coordinates: - tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 photometry: tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 - required: [basic, coordinates, photometry, program] + required: [basic, photometry, program] source_catalog: title: Source Catalog description: | diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index acd88582..15f4bf50 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -20,13 +20,11 @@ properties: description: | WFI optical element used to take the data. $ref: wfi_optical_element-1.0.0 - coordinates: - tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 visit: tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 - required: [optical_element, coordinates, program, visit] + required: [optical_element, program, visit] data: title: Segmentation map description: | From c293c6ca1f1042b41caf7c1b8b219ae3cbf2bf27 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 27 Mar 2024 12:51:42 -0400 Subject: [PATCH 17/22] address comments --- .../schemas/mosaic_segmentation_map-1.0.0.yaml | 1 + .../schemas/mosaic_source_catalog-1.0.0.yaml | 1 + src/rad/resources/schemas/segmentation_map-1.0.0.yaml | 2 ++ src/rad/resources/schemas/source_catalog-1.0.0.yaml | 11 +++++++---- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml index 2f3d78df..368628a2 100644 --- a/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_segmentation_map-1.0.0.yaml @@ -18,6 +18,7 @@ properties: basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 program: + title: Program Information tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 required: [basic, program] data: diff --git a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml index e068fccb..49789bb4 100644 --- a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml @@ -20,6 +20,7 @@ properties: photometry: tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: + title: Program Information tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 required: [basic, photometry, program] source_catalog: diff --git a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml index 15f4bf50..f3c80443 100644 --- a/src/rad/resources/schemas/segmentation_map-1.0.0.yaml +++ b/src/rad/resources/schemas/segmentation_map-1.0.0.yaml @@ -21,8 +21,10 @@ properties: WFI optical element used to take the data. $ref: wfi_optical_element-1.0.0 program: + title: Program Information tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 visit: + title: Visit Information tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 required: [optical_element, program, visit] data: diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index fe4e5dde..24de4a7b 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -3,7 +3,7 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/source_catalog-1.0.0 -title: Source catalog generated from a Level 3 file by the Source Catalog Step. +title: Source catalog generated from a Level 2 file by the Source Catalog Step. datamodel_name: SourceCatalogModel @@ -20,13 +20,16 @@ properties: description: | WFI optical element used to take the data. $ref: wfi_optical_element-1.0.0 - coordinates: - tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 + exposure: + title: Exposure Information + tag: asdf://stsci.edu/datamodels/roman/tags/exposure-1.0.0 program: + title: Program Information tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 visit: + title: Visit Information tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 - required: [optical_element, coordinates, program, visit] + required: [optical_element, exposure, program, visit] source_catalog: title: Source Catalog description: | From d9d268fd7b34484f727fca7bd7fd7cc116e46743 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Mon, 1 Apr 2024 18:48:00 -0400 Subject: [PATCH 18/22] Add database destination tables for mosaic_source_catalog --- CHANGES.rst | 4 +-- .../resources/schemas/mosaic_basic-1.0.0.yaml | 26 +++++++++---------- .../schemas/mosaic_source_catalog-1.0.0.yaml | 1 + .../resources/schemas/photometry-1.0.0.yaml | 18 ++++++++----- src/rad/resources/schemas/program-1.0.0.yaml | 18 ++++++++----- .../calibration_software_version-1.0.0.yaml | 3 ++- .../tagged_scalars/file_date-1.0.0.yaml | 3 ++- .../tagged_scalars/filename-1.0.0.yaml | 3 ++- .../tagged_scalars/model_type-1.0.0.yaml | 3 ++- .../schemas/tagged_scalars/origin-1.0.0.yaml | 3 ++- .../prd_software_version-1.0.0.yaml | 3 ++- .../sdf_software_version-1.0.0.yaml | 3 ++- .../tagged_scalars/telescope-1.0.0.yaml | 3 ++- 13 files changed, 55 insertions(+), 36 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index ab4ac45b..f7843555 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -26,9 +26,7 @@ - Create the flux step schema. [#395] -- Add source_datalog and segmentation_map schemas. [#374] - -Add source_catalog and segmentation_map schemas for Level 2 and Level 3 files. [#393] +- Add source_catalog and segmentation_map schemas for Level 2 and Level 3 files. [#393] 0.19.0 (2024-02-09) ------------------- diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 45277af9..959682a9 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -16,7 +16,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [WFIMosaic.time_first_mjd] + destination: [WFIMosaic.time_first_mjd, SourceCatalog.time_first_mjd, SegmentationMap.time_first_mjd] time_last_mjd: title: Latest component image end time in the mosaic in MJD type: number @@ -26,7 +26,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [WFIMosaic.time_last_mjd] + destination: [WFIMosaic.time_last_mjd, SourceCatalog.time_last_mjd, SegmentationMap.time_last_mjd] time_mean_mjd: title: Mean of mid-times of component images in MJD type: number @@ -36,7 +36,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [WFIMosaic.time_mean_mjd] + destination: [WFIMosaic.time_mean_mjd, SourceCatalog.time_mean_mjd, SegmentationMap.time_mean_mjd] max_exposure_time: title: Maximum component image exposure time in MJD type: number @@ -46,7 +46,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [WFIMosaic.max_exposure_time] + destination: [WFIMosaic.max_exposure_time, SourceCatalog.max_exposure_time, SegmentationMap.max_exposure_time] mean_exposure_time: title: Mean of component image exposure times in MJD type: number @@ -56,7 +56,7 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [WFIMosaic.mean_exposure_time] + destination: [WFIMosaic.mean_exposure_time, SourceCatalog.mean_exposure_time, SegmentationMap.mean_exposure_time] visit: title: Visit number within the observation, defined range of values is 1..999; included in obs_id and visit_id as 'VVV'. @@ -67,7 +67,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [WFIMosaic.visit] + destination: [WFIMosaic.visit, SourceCatalog.visit, SegmentationMap.visit] segment: title: Segment Number within pass, defined range is 1..999; included in obs_id and visit_id as 'SSS'. @@ -89,7 +89,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [WFIMosaic.pass] + destination: [WFIMosaic.pass, SourceCatalog.pass, SegmentationMap.pass] program: title: Program number, defined range is 1..18445; included in obs_id and visit_id as 'PPPPP'. @@ -100,13 +100,13 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [WFIMosaic.program] + destination: [WFIMosaic.program, SourceCatalog.program, SegmentationMap.program] survey: title: Observation Survey type: string archive_catalog: datatype: nvarchar(15) - destination: [WFIMosaic.survey] + destination: [WFIMosaic.survey, SourceCatalog.survey, SegmentationMap.survey] optical_element: $ref: wfi_optical_element-1.0.0 sdf: @@ -115,7 +115,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(20) - destination: [WFIMosaic.optical_element] + destination: [WFIMosaic.optical_element, SourceCatalog.optical_element, SegmentationMap.optical_element] instrument: title: Instrument used to acquire the data type: string @@ -126,7 +126,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(5) - destination: [WFIMosaic.instrument_name] + destination: [WFIMosaic.instrument_name, SourceCatalog.instrument_name, SegmentationMap.instrument_name] location_name: title: Name of the skycell containing the mosaic type: string @@ -136,7 +136,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(25) - destination: [WFIMosaic.location_name] + destination: [WFIMosaic.location_name, SourceCatalog.location_name, SegmentationMap.location_name] product_type: title: Association product type type: string @@ -146,7 +146,7 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(25) - destination: [WFIMosaic.product_type] + destination: [WFIMosaic.product_type, SourceCatalog.product_type, SegmentationMap.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, mean_exposure_time, visit, segment, pass, program, survey, optical_element, instrument, location_name, product_type] diff --git a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml index 49789bb4..02ab92c5 100644 --- a/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_source_catalog-1.0.0.yaml @@ -18,6 +18,7 @@ properties: basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 photometry: + title: Photometry Information tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: title: Program Information diff --git a/src/rad/resources/schemas/photometry-1.0.0.yaml b/src/rad/resources/schemas/photometry-1.0.0.yaml index e3cf36a2..32601ecf 100644 --- a/src/rad/resources/schemas/photometry-1.0.0.yaml +++ b/src/rad/resources/schemas/photometry-1.0.0.yaml @@ -21,7 +21,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.conversion_megajanskys, WFIMosaic.conversion_megajanskys] + destination: [WFIExposure.conversion_megajanskys, WFIMosaic.conversion_megajanskys, + SourceCatalog.conversion_megajanskys] conversion_microjanskys: title: Flux Density Producing 1 count per second (uJy / arcsec2) description: | @@ -37,7 +38,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.conversion_microjanskys, WFIMosaic.conversion_microjanskys] + destination: [WFIExposure.conversion_microjanskys, WFIMosaic.conversion_microjanskys, + SourceCatalog.conversion_microjanskys] pixelarea_steradians: title: Nominal Pixel Area (steradians) description: | @@ -53,7 +55,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.pixelarea_steradians, WFIMosaic.pixelarea_steradians] + destination: [WFIExposure.pixelarea_steradians, WFIMosaic.pixelarea_steradians, + SourceCatalog.pixelarea_steradians] pixelarea_arcsecsq: title: Nominal Pixel Area (arcsec^2) description: | @@ -69,7 +72,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.pixelarea_arcsecsq, WFIMosaic.pixelarea_arcsecsq] + destination: [WFIExposure.pixelarea_arcsecsq, WFIMosaic.pixelarea_arcsecsq, + SourceCatalog.pixelarea_arcsecsq] conversion_megajanskys_uncertainty: title: Uncertainty in Flux Density Conversion (from DN / s to MJy / steradians) description: | @@ -86,7 +90,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.conversion_megajanskys_uncertainty, WFIMosaic.conversion_megajanskys_uncertainty] + destination: [WFIExposure.conversion_megajanskys_uncertainty, WFIMosaic.conversion_megajanskys_uncertainty, + SourceCatalog.conversion_megajanskys_uncertainty] conversion_microjanskys_uncertainty: title: Uncertainty in Flux Density Conversion (from DN / s to uJy / arcsec^2) description: | @@ -103,7 +108,8 @@ properties: - type: "null" archive_catalog: datatype: float - destination: [WFIExposure.conversion_microjanskys_uncertainty, WFIMosaic.conversion_microjanskys_uncertainty] + destination: [WFIExposure.conversion_microjanskys_uncertainty, WFIMosaic.conversion_microjanskys_uncertainty, + SourceCatalog.conversion_microjanskys_uncertainty] propertyOrder: [conversion_microjanskys, conversion_megajanskys, pixelarea_steradians, pixelarea_arcsecsq, conversion_megajanskys_uncertainty, conversion_microjanskys_uncertainty] diff --git a/src/rad/resources/schemas/program-1.0.0.yaml b/src/rad/resources/schemas/program-1.0.0.yaml index 96313f98..25cd7495 100644 --- a/src/rad/resources/schemas/program-1.0.0.yaml +++ b/src/rad/resources/schemas/program-1.0.0.yaml @@ -17,7 +17,8 @@ properties: origin: PSS:dms_program.title archive_catalog: datatype: nvarchar(200) - destination: [WFIExposure.program_title, WFIMosaic.program_title, GuideWindow.program_title] + destination: [WFIExposure.program_title, WFIMosaic.program_title, GuideWindow.program_title, + SourceCatalog.program_title, SegmentationMap.program_title] pi_name: title: Principal Investigator Name description: | @@ -31,7 +32,8 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(100) - destination: [WFIExposure.pi_name, WFIMosaic.pi_name, GuideWindow.pi_name] + destination: [WFIExposure.pi_name, WFIMosaic.pi_name, GuideWindow.pi_name, + SourceCatalog.pi_name, SegmentationMap.pi_name] category: title: Program Category description: | @@ -43,7 +45,8 @@ properties: origin: PSS:dms_program.category archive_catalog: datatype: nvarchar(6) - destination: [WFIExposure.program_category, WFIMosaic.program_category, GuideWindow.program_category] + destination: [WFIExposure.program_category, WFIMosaic.program_category, GuideWindow.program_category, + SourceCatalog.program_category, SegmentationMap.program_category] subcategory: title: Program Subcategory description: | @@ -55,7 +58,8 @@ properties: origin: PSS:dms_program.subcategory archive_catalog: datatype: nvarchar(15) - destination: [WFIExposure.program_subcategory, WFIMosaic.program_subcategory, GuideWindow.program_subcategory] + destination: [WFIExposure.program_subcategory, WFIMosaic.program_subcategory, GuideWindow.program_subcategory, + SourceCatalog.program_subcategory, SegmentationMap.program_subcategory] science_category: title: Science Category description: | @@ -68,7 +72,8 @@ properties: origin: PSS:dms_program.science_category archive_catalog: datatype: nvarchar(50) - destination: [WFIExposure.science_category, WFIMosaic.science_category, GuideWindow.science_category] + destination: [WFIExposure.science_category, WFIMosaic.science_category, GuideWindow.science_category, + SourceCatalog.science_category, SegmentationMap.science_category] continuation_id: title: Continuation ID description: | @@ -81,7 +86,8 @@ properties: origin: PSS:dms_program.continuation_id archive_catalog: datatype: int - destination: [WFIExposure.continuation_id, WFIMosaic.continuation_id, GuideWindow.continuation_id] + destination: [WFIExposure.continuation_id, WFIMosaic.continuation_id, GuideWindow.continuation_id, + SourceCatalog.continuation_id, SegmentationMap.continuation_id] propertyOrder: [title, pi_name, category, subcategory, science_category, continuation_id] flowStyle: block required: [title, pi_name, category, subcategory, science_category, continuation_id] diff --git a/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml index 24ba37b9..00953614 100644 --- a/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/calibration_software_version-1.0.0.yaml @@ -12,7 +12,8 @@ sdf: archive_catalog: datatype: nvarchar(120) destination: [WFIExposure.calibration_software_version, GuideWindow.calibration_software_version, - WFICommon.calibration_software_version, WFIMosaic.calibration_software_version] + WFICommon.calibration_software_version, WFIMosaic.calibration_software_version, + SourceCatalog.calibration_software_version, SegmentationMap.calibration_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml index 96255599..b0151b92 100644 --- a/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/file_date-1.0.0.yaml @@ -14,7 +14,8 @@ sdf: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.filedate, GuideWindow.filedate, WFICommon.filedate, WFIMosaic.filedate] + destination: [WFIExposure.filedate, GuideWindow.filedate, WFICommon.filedate, WFIMosaic.filedate, + SourceCatalog.filedate, SegmentationMap.filedate] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml index 420ab32b..5038390e 100644 --- a/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/filename-1.0.0.yaml @@ -11,7 +11,8 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(120) - destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename, WFICommon.filename] + destination: [WFIExposure.filename, WFIMosaic.filename, GuideWindow.filename, WFICommon.filename, + SourceCatalog.filename, SegmentationMap.filename] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml index 6c130bf8..eb8af109 100644 --- a/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/model_type-1.0.0.yaml @@ -11,7 +11,8 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(50) - destination: [WFIExposure.model_type, GuideWindow.model_type, WFICommon.model_type, WFIMosaic.model_type] + destination: [WFIExposure.model_type, GuideWindow.model_type, WFICommon.model_type, WFIMosaic.model_type, + SourceCatalog.model_type, SegmentationMap.model_type] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml index 55e86245..ed2dc949 100644 --- a/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/origin-1.0.0.yaml @@ -14,7 +14,8 @@ sdf: origin: TBD archive_catalog: datatype: nvarchar(15) - destination: [WFIExposure.origin, GuideWindow.origin, WFICommon.origin, WFIMosaic.origin] + destination: [WFIExposure.origin, GuideWindow.origin, WFICommon.origin, WFIMosaic.origin, + SourceCatalog.origin, SegmentationMap.origin] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml index e2fe067f..d9421103 100644 --- a/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/prd_software_version-1.0.0.yaml @@ -12,7 +12,8 @@ sdf: archive_catalog: datatype: nvarchar(120) destination: [WFIExposure.prd_software_version, GuideWindow.prd_software_version, - WFICommon.prd_software_version, WFIMosaic.prd_software_version] + WFICommon.prd_software_version, WFIMosaic.prd_software_version, + SourceCatalog.prd_software_version, SegmentationMap.prd_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml index 67b58932..dc84ae82 100644 --- a/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/sdf_software_version-1.0.0.yaml @@ -12,7 +12,8 @@ sdf: archive_catalog: datatype: nvarchar(120) destination: [WFIExposure.sdf_software_version, GuideWindow.sdf_software_version, - WFICommon.sdf_software_version, WFIMosaic.sdf_software_version] + WFICommon.sdf_software_version, WFIMosaic.sdf_software_version, + SourceCatalog.sdf_software_version, SegmentationMap.sdf_software_version] flowStyle: block ... diff --git a/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml b/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml index 83270a12..ae5f1320 100644 --- a/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml +++ b/src/rad/resources/schemas/tagged_scalars/telescope-1.0.0.yaml @@ -10,7 +10,8 @@ enum: [ROMAN] archive_catalog: datatype: nvarchar(5) - destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope, WFICommon.telescope] + destination: [WFIExposure.telescope, WFIMosaic.telescope, GuideWindow.telescope, WFICommon.telescope, + SourceCatalog.telescope, SegmentationMap.telescope] flowStyle: block ... From 5ed67a9e735d004fa2f8a684949a6180cebf94fa Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 3 Apr 2024 09:09:03 -0400 Subject: [PATCH 19/22] add archive destinations for L2 catalogs --- src/rad/resources/schemas/exposure-1.0.0.yaml | 51 ++++++++++++------- src/rad/resources/schemas/visit-1.0.0.yaml | 27 ++++++---- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/rad/resources/schemas/exposure-1.0.0.yaml b/src/rad/resources/schemas/exposure-1.0.0.yaml index 74692db9..43b6897d 100644 --- a/src/rad/resources/schemas/exposure-1.0.0.yaml +++ b/src/rad/resources/schemas/exposure-1.0.0.yaml @@ -22,7 +22,8 @@ allOf: origin: TBD archive_catalog: datatype: int - destination: [WFIExposure.exposure_id, GuideWindow.exposure_id] + destination: [WFIExposure.exposure_id, GuideWindow.exposure_id, + SourceCatalog.exposure_id, SegmentationMap.exposure_id] mid_time: title: Exposure Mid Time (UTC) description: | @@ -34,7 +35,8 @@ allOf: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.exposure_mid_time, GuideWindow.exposure_mid_time] + destination: [WFIExposure.exposure_mid_time, GuideWindow.exposure_mid_time, + SourceCatalog.exposure_mid_time, SegmentationMap.exposure_mid_time] end_time: title: Exposure End Time (UTC) description: | @@ -46,7 +48,8 @@ allOf: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.exposure_end_time, GuideWindow.exposure_end_time] + destination: [WFIExposure.exposure_end_time, GuideWindow.exposure_end_time, + SourceCatalog.exposure_end_time, SegmentationMap.exposure_end_time] start_time_mjd: title: MJD Start Time (d) description: | @@ -59,7 +62,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_start_time_mjd, GuideWindow.exposure_start_time_mjd] + destination: [WFIExposure.exposure_start_time_mjd, GuideWindow.exposure_start_time_mjd, + SourceCatalog.exposure_start_time_mjd, SegmentationMap.exposure_start_time_mjd] mid_time_mjd: title: MJD Mid Time (d) description: | @@ -72,7 +76,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_mid_time_mjd, GuideWindow.exposure_mid_time_mjd] + destination: [WFIExposure.exposure_mid_time_mjd, GuideWindow.exposure_mid_time_mjd, + SourceCatalog.exposure_mid_time_mjd, SegmentationMap.exposure_mid_time_mjd] end_time_mjd: title: MJD End Time (d) description: | @@ -85,7 +90,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_end_time_mjd, GuideWindow.exposure_end_time_mjd] + destination: [WFIExposure.exposure_end_time_mjd, GuideWindow.exposure_end_time_mjd, + SourceCatalog.exposure_end_time_mjd, SegmentationMap.exposure_end_time_mjd] start_time_tdb: title: TDB Start Time (d) description: | @@ -98,7 +104,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_start_time_tdb, GuideWindow.exposure_start_time_tdb] + destination: [WFIExposure.exposure_start_time_tdb, GuideWindow.exposure_start_time_tdb, + SourceCatalog.exposure_start_time_tdb, SegmentationMap.exposure_start_time_tdb] mid_time_tdb: title: TDB Mid Time (d) description: | @@ -111,7 +118,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_mid_time_tdb, GuideWindow.exposure_mid_time_tdb] + destination: [WFIExposure.exposure_mid_time_tdb, GuideWindow.exposure_mid_time_tdb, + SourceCatalog.exposure_mid_time_tdb, SegmentationMap.exposure_mid_time_tdb] end_time_tdb: title: TDB End Time (d) description: | @@ -124,7 +132,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb] + destination: [WFIExposure.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb, + SourceCatalog.exposure_end_time_tdb, SegmentationMap.exposure_end_time_tdb] sca_number: title: SCA Number description: | @@ -137,7 +146,8 @@ allOf: origin: TBD archive_catalog: datatype: int - destination: [WFIExposure.exposure_sca_number, GuideWindow.exposure_sca_number] + destination: [WFIExposure.exposure_sca_number, GuideWindow.exposure_sca_number, + SourceCatalog.exposure_sca_number, SegmentationMap.exposure_sca_number] gain_factor: title: Gain Factor type: number @@ -147,7 +157,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_gain_factor, GuideWindow.exposure_gain_factor] + destination: [WFIExposure.exposure_gain_factor, GuideWindow.exposure_gain_factor, + SourceCatalog.exposure_gain_factor, SegmentationMap.exposure_gain_factor] integration_time: title: Effective Integration Time (s) description: @@ -159,7 +170,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_integration_time, GuideWindow.exposure_integration_time] + destination: [WFIExposure.exposure_integration_time, GuideWindow.exposure_integration_time, + SourceCatalog.exposure_integration_time, SegmentationMap.exposure_integration_time] elapsed_exposure_time: title: Elapsed Exposure Time (s) description: | @@ -172,7 +184,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.elapsed_exposure_time, GuideWindow.elapsed_exposure_time] + destination: [WFIExposure.elapsed_exposure_time, GuideWindow.elapsed_exposure_time, + SourceCatalog.elapsed_exposure_time, SegmentationMap.elapsed_exposure_time] effective_exposure_time: title: Effective Exposure Time (s) description: | @@ -185,7 +198,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.effective_exposure_time, GuideWindow.effective_exposure_time] + destination: [WFIExposure.effective_exposure_time, GuideWindow.effective_exposure_time, + SourceCatalog.effective_exposure_time, SegmentationMap.effective_exposure_time] duration: title: Exposure Duration (s) description: | @@ -198,7 +212,8 @@ allOf: origin: TBD archive_catalog: datatype: float - destination: [WFIExposure.exposure_duration, GuideWindow.exposure_duration] + destination: [WFIExposure.exposure_duration, GuideWindow.exposure_duration, + SourceCatalog.exposure_duration, SegmentationMap.exposure_duration] level0_compressed: title: Level 0 Compression description: | @@ -211,7 +226,8 @@ allOf: origin: TBD archive_catalog: datatype: nchar(1) - destination: [WFIExposure.exposure_level0_compressed, GuideWindow.exposure_level0_compressed] + destination: [WFIExposure.exposure_level0_compressed, GuideWindow.exposure_level0_compressed, + SourceCatalog.exposure_level0_compressed, SegmentationMap.exposure_level0_compressed] truncated: title: Truncated MA Table description: | @@ -223,7 +239,8 @@ allOf: origin: TBD archive_catalog: datatype: nchar(1) - destination: [WFIExposure.exposure_truncated] + destination: [WFIExposure.exposure_truncated, + SourceCatalog.exposure_truncated, SegmentationMap.exposure_truncated] required: [id, mid_time, end_time, start_time_mjd, mid_time_mjd, end_time_mjd, diff --git a/src/rad/resources/schemas/visit-1.0.0.yaml b/src/rad/resources/schemas/visit-1.0.0.yaml index 3fc748a9..3d9e0c97 100644 --- a/src/rad/resources/schemas/visit-1.0.0.yaml +++ b/src/rad/resources/schemas/visit-1.0.0.yaml @@ -20,7 +20,8 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(10) - destination: [WFIExposure.engineering_quality, GuideWindow.engineering_quality] + destination: [WFIExposure.engineering_quality, GuideWindow.engineering_quality, + SourceCatalog.engineering_quality, SegmentationMap.engineering_quality] pointing_engdb_quality: title: Engineering Quality of Pointing description: | @@ -34,7 +35,8 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(10) - destination: [WFIExposure.pointing_engdb_quality, GuideWindow.pointing_engdb_quality] + destination: [WFIExposure.pointing_engdb_quality, GuideWindow.pointing_engdb_quality, + SourceCatalog.pointing_engdb_quality, SegmentationMap.pointing_engdb_quality] type: title: Visit Type description: | @@ -46,7 +48,8 @@ properties: origin: PSS:dms_visit.visit_type archive_catalog: datatype: nvarchar(30) - destination: [WFIExposure.visit_type, GuideWindow.visit_type] + destination: [WFIExposure.visit_type, GuideWindow.visit_type, + SourceCatalog.visit_type, SegmentationMap.visit_type] start_time: title: Visit Start Time (UTC) description: | @@ -58,7 +61,8 @@ properties: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.visit_start_time, GuideWindow.visit_start_time] + destination: [WFIExposure.visit_start_time, GuideWindow.visit_start_time, + SourceCatalog.visit_start_time, SegmentationMap.visit_start_time] end_time: title: Visit End Time (UTC) description: | @@ -70,7 +74,8 @@ properties: origin: TBD archive_catalog: datatype: datetime2 - destination: [WFIExposure.visit_end_time, GuideWindow.visit_end_time] + destination: [WFIExposure.visit_end_time, GuideWindow.visit_end_time, + SourceCatalog.visit_end_time, SegmentationMap.visit_end_time] status: title: Visit Status description: | @@ -82,7 +87,8 @@ properties: origin: TBD archive_catalog: datatype: nvarchar(15) - destination: [WFIExposure.visit_status, GuideWindow.visit_status] + destination: [WFIExposure.visit_status, GuideWindow.visit_status, + SourceCatalog.visit_status, SegmentationMap.visit_status] total_exposures: title: Total Number of Exposures description: | @@ -94,7 +100,8 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [WFIExposure.visit_total_exposures, GuideWindow.visit_total_exposures] + destination: [WFIExposure.visit_total_exposures, GuideWindow.visit_total_exposures, + SourceCatalog.visit_total_exposures, SegmentationMap.visit_total_exposures] internal_target: title: Internal Target description: | @@ -108,7 +115,8 @@ properties: origin: TBD archive_catalog: datatype: nchar(1) - destination: [WFIExposure.visit_internal_target, GuideWindow.visit_internal_target] + destination: [WFIExposure.visit_internal_target, GuideWindow.visit_internal_target, + SourceCatalog.visit_internal_target, SegmentationMap.visit_internal_target] target_of_opportunity: title: Target of Opportunity description: | @@ -122,7 +130,8 @@ properties: origin: TBD archive_catalog: datatype: nchar(1) - destination: [WFIExposure.target_of_opportunity, GuideWindow.target_of_opportunity] + destination: [WFIExposure.target_of_opportunity, GuideWindow.target_of_opportunity, + SourceCatalog.target_of_opportunity, SegmentationMap.target_of_opportunity] propertyOrder: [engineering_quality, pointing_engdb_quality, type, start_time, end_time, status, total_exposures, internal_target, target_of_opportunity] flowStyle: block From 4fc8bad8d9995a394eb7c67ec4db338a80bd3b65 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 3 Apr 2024 09:11:33 -0400 Subject: [PATCH 20/22] add segment destination --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 959682a9..08396b68 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -78,7 +78,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [WFIMosaic.segment] + destination: [WFIMosaic.segment, SourceCatalog.segment, SegmentationMap.segment] pass: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. From 386e5f2c36caa485e412c165d052d1640d22458d Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 3 Apr 2024 11:03:35 -0400 Subject: [PATCH 21/22] remove SegmentationMap table from exposure schema --- src/rad/resources/schemas/exposure-1.0.0.yaml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/rad/resources/schemas/exposure-1.0.0.yaml b/src/rad/resources/schemas/exposure-1.0.0.yaml index 43b6897d..e8be9850 100644 --- a/src/rad/resources/schemas/exposure-1.0.0.yaml +++ b/src/rad/resources/schemas/exposure-1.0.0.yaml @@ -23,7 +23,7 @@ allOf: archive_catalog: datatype: int destination: [WFIExposure.exposure_id, GuideWindow.exposure_id, - SourceCatalog.exposure_id, SegmentationMap.exposure_id] + SourceCatalog.exposure_id] mid_time: title: Exposure Mid Time (UTC) description: | @@ -36,7 +36,7 @@ allOf: archive_catalog: datatype: datetime2 destination: [WFIExposure.exposure_mid_time, GuideWindow.exposure_mid_time, - SourceCatalog.exposure_mid_time, SegmentationMap.exposure_mid_time] + SourceCatalog.exposure_mid_time] end_time: title: Exposure End Time (UTC) description: | @@ -49,7 +49,7 @@ allOf: archive_catalog: datatype: datetime2 destination: [WFIExposure.exposure_end_time, GuideWindow.exposure_end_time, - SourceCatalog.exposure_end_time, SegmentationMap.exposure_end_time] + SourceCatalog.exposure_end_time] start_time_mjd: title: MJD Start Time (d) description: | @@ -63,7 +63,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_start_time_mjd, GuideWindow.exposure_start_time_mjd, - SourceCatalog.exposure_start_time_mjd, SegmentationMap.exposure_start_time_mjd] + SourceCatalog.exposure_start_time_mjd] mid_time_mjd: title: MJD Mid Time (d) description: | @@ -77,7 +77,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_mid_time_mjd, GuideWindow.exposure_mid_time_mjd, - SourceCatalog.exposure_mid_time_mjd, SegmentationMap.exposure_mid_time_mjd] + SourceCatalog.exposure_mid_time_mjd] end_time_mjd: title: MJD End Time (d) description: | @@ -91,7 +91,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_end_time_mjd, GuideWindow.exposure_end_time_mjd, - SourceCatalog.exposure_end_time_mjd, SegmentationMap.exposure_end_time_mjd] + SourceCatalog.exposure_end_time_mjd] start_time_tdb: title: TDB Start Time (d) description: | @@ -105,7 +105,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_start_time_tdb, GuideWindow.exposure_start_time_tdb, - SourceCatalog.exposure_start_time_tdb, SegmentationMap.exposure_start_time_tdb] + SourceCatalog.exposure_start_time_tdb] mid_time_tdb: title: TDB Mid Time (d) description: | @@ -119,7 +119,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_mid_time_tdb, GuideWindow.exposure_mid_time_tdb, - SourceCatalog.exposure_mid_time_tdb, SegmentationMap.exposure_mid_time_tdb] + SourceCatalog.exposure_mid_time_tdb] end_time_tdb: title: TDB End Time (d) description: | @@ -133,7 +133,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_end_time_tdb, GuideWindow.exposure_end_time_tdb, - SourceCatalog.exposure_end_time_tdb, SegmentationMap.exposure_end_time_tdb] + SourceCatalog.exposure_end_time_tdb] sca_number: title: SCA Number description: | @@ -147,7 +147,7 @@ allOf: archive_catalog: datatype: int destination: [WFIExposure.exposure_sca_number, GuideWindow.exposure_sca_number, - SourceCatalog.exposure_sca_number, SegmentationMap.exposure_sca_number] + SourceCatalog.exposure_sca_number] gain_factor: title: Gain Factor type: number @@ -158,7 +158,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_gain_factor, GuideWindow.exposure_gain_factor, - SourceCatalog.exposure_gain_factor, SegmentationMap.exposure_gain_factor] + SourceCatalog.exposure_gain_factor] integration_time: title: Effective Integration Time (s) description: @@ -171,7 +171,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_integration_time, GuideWindow.exposure_integration_time, - SourceCatalog.exposure_integration_time, SegmentationMap.exposure_integration_time] + SourceCatalog.exposure_integration_time] elapsed_exposure_time: title: Elapsed Exposure Time (s) description: | @@ -185,7 +185,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.elapsed_exposure_time, GuideWindow.elapsed_exposure_time, - SourceCatalog.elapsed_exposure_time, SegmentationMap.elapsed_exposure_time] + SourceCatalog.elapsed_exposure_time] effective_exposure_time: title: Effective Exposure Time (s) description: | @@ -199,7 +199,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.effective_exposure_time, GuideWindow.effective_exposure_time, - SourceCatalog.effective_exposure_time, SegmentationMap.effective_exposure_time] + SourceCatalog.effective_exposure_time] duration: title: Exposure Duration (s) description: | @@ -213,7 +213,7 @@ allOf: archive_catalog: datatype: float destination: [WFIExposure.exposure_duration, GuideWindow.exposure_duration, - SourceCatalog.exposure_duration, SegmentationMap.exposure_duration] + SourceCatalog.exposure_duration] level0_compressed: title: Level 0 Compression description: | @@ -227,7 +227,7 @@ allOf: archive_catalog: datatype: nchar(1) destination: [WFIExposure.exposure_level0_compressed, GuideWindow.exposure_level0_compressed, - SourceCatalog.exposure_level0_compressed, SegmentationMap.exposure_level0_compressed] + SourceCatalog.exposure_level0_compressed] truncated: title: Truncated MA Table description: | @@ -240,7 +240,7 @@ allOf: archive_catalog: datatype: nchar(1) destination: [WFIExposure.exposure_truncated, - SourceCatalog.exposure_truncated, SegmentationMap.exposure_truncated] + SourceCatalog.exposure_truncated] required: [id, mid_time, end_time, start_time_mjd, mid_time_mjd, end_time_mjd, From a5384b61503e4f137deddaf5a7d48832ad52d421 Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 3 Apr 2024 14:35:48 -0400 Subject: [PATCH 22/22] add photometry to L2 catalogs --- src/rad/resources/schemas/source_catalog-1.0.0.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/source_catalog-1.0.0.yaml b/src/rad/resources/schemas/source_catalog-1.0.0.yaml index 24de4a7b..0bbbb471 100644 --- a/src/rad/resources/schemas/source_catalog-1.0.0.yaml +++ b/src/rad/resources/schemas/source_catalog-1.0.0.yaml @@ -23,13 +23,16 @@ properties: exposure: title: Exposure Information tag: asdf://stsci.edu/datamodels/roman/tags/exposure-1.0.0 + photometry: + title: Photometry Information + tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: title: Program Information tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 visit: title: Visit Information tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 - required: [optical_element, exposure, program, visit] + required: [optical_element, exposure, photometry, program, visit] source_catalog: title: Source Catalog description: |