Ensure we ref the transform schema

DKISTDC · Oct 16, 2023 · de9b3d0 · de9b3d0
1 parent b0c9a15
commit de9b3d0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/dkist/io/asdf/resources/schemas/ravel_model-1.0.0.yaml b/dkist/io/asdf/resources/schemas/ravel_model-1.0.0.yaml
@@ -7,10 +7,11 @@ title: A model to flatten 2D indices into 1D
 description:
   A model which takes a pair of indices and flattens them into the corresponding index for a 1D array. This can be used as a compound with Tabular1D to enable it to be indexed as if it were Tabular2D.
 
-type: object
-properties:
-  array_shape:
-    type: array
-  order:
-    type: string
-required: [array_shape, order]
+allOf:
+  - $ref: "http://stsci.edu/schemas/asdf/transform/transform-1.2.0"
+  - properties:
+    array_shape:
+      type: array
+    order:
+      type: string
+    required: [array_shape, order]
diff --git a/dkist/io/asdf/resources/schemas/varying_celestial_transform-1.0.0.yaml b/dkist/io/asdf/resources/schemas/varying_celestial_transform-1.0.0.yaml
@@ -7,31 +7,32 @@ title: A varying FITS-like celestial transform.
 description:
   A model which represents a FITS-like celestial WCS transform which varies over a third pixel input.
 
-type: object
-properties:
-  crpix:
-    anyOf:
-      - tag: "core/ndarray-1.0.0"
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
-  cdelt:
-    anyOf:
-      - tag: "core/ndarray-1.0.0"
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
-  lon_pole:
-    anyOf:
-      - type: number
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
-  crval_table:
-    anyOf:
-      - tag: "core/ndarray-1.0.0"
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
-  pc_table:
-    anyOf:
-      - tag: "core/ndarray-1.0.0"
-      - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
-  projection:
-    $ref: "http://stsci.edu/schemas/asdf/transform/transform-1.2.0"
+allOf:
+  - $ref: "http://stsci.edu/schemas/asdf/transform/transform-1.2.0"
+  - properties:
+      crpix:
+        anyOf:
+          - tag: "core/ndarray-1.0.0"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
+      cdelt:
+        anyOf:
+          - tag: "core/ndarray-1.0.0"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
+      lon_pole:
+        anyOf:
+          - type: number
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
+      crval_table:
+        anyOf:
+          - tag: "core/ndarray-1.0.0"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
+      pc_table:
+        anyOf:
+          - tag: "core/ndarray-1.0.0"
+          - tag: "tag:stsci.edu:asdf/unit/quantity-1.1.0"
+      projection:
+        $ref: "http://stsci.edu/schemas/asdf/transform/transform-1.2.0"
 
-required: [crpix, cdelt, lon_pole, crval_table, pc_table, projection]
-additionalProperties: true
+    required: [crpix, cdelt, lon_pole, crval_table, pc_table, projection]
+    additionalProperties: true
 ...