Updates from Nadia's review comments

spacetelescope · Feb 27, 2024 · 58034a8 · 58034a8
1 parent 7fb41bc
commit 58034a8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -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
@@ -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]
 ...