From 6bf137c0e86496c7a01ba701bfa11218d0b20554 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Mon, 4 Mar 2024 14:13:24 -0500 Subject: [PATCH] fixing meta and binary block order --- .../resources/schemas/segmentation_map-1.0.0.yaml | 14 +++++++------- .../resources/schemas/source_catalog-1.0.0.yaml | 10 +++++----- 2 files changed, 12 insertions(+), 12 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 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