Initial push.

PaulHuwe · Oct 26, 2023 · bf2556d · bf2556d
1 parent 75414b0
commit bf2556d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml
@@ -130,8 +130,13 @@ tags:
   title: Combined level 2 metadata
   description: |-
     Combined level 2 metadata
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosiac_basic-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosiac_basic-1.0.0
+  title: Basic mosaic metadata keywords
+  description: |-
+    Basic mosaic metadata keywords
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mocais_wcsinfo-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mocaic_wcsinfo-1.0.0
   title: Mosaic WCS parameters
   description: |-
     Mosaic WCS parameters

diff --git a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml
@@ -11,10 +11,8 @@ type: object
 properties:
   all_meta:
     description: |
-      A list of columns in the table.
+      Table of level 2 metadata.
     type: array
-    items:
-      $ref: column-1.1.0
 required: [all_meta]
 flowStyle: block
 propertyOrder: [all_meta]

diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-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/mosiac_basic-1.0.0
 
-title: Common mosaic metadata keywords
+title: Basic mosaic metadata keywords
 type: object
 
 properties:
@@ -140,15 +140,11 @@ properties:
       datatype: nvarchar(25)
       destination: [ScienceCommon.product_type]
 
-propertyOrder: [ ra_center, dec_center, x_center, y_center, orientat, nx, ny, 
-                 x0_projection, y0_projection, ra_corn1, dec_corn1, ra_corn2,
-                 dec_corn2, ra_corn3, dec_corn3, ra_corn4, dec_corn4, pixel_scale,
-                 ra_projection_center, dec_projection_center, 
-                 orientat_projection_center, s_region ]
+propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time,
+                 mean_exposure_time, visit, segment, pass, survey, optical_element, 
+                 instrument, telescope, location_name, product_type ]
 flowStyle: block
-required: [ ra_center, dec_center, x_center, y_center, orientat, nx, ny, 
-            x0_projection, y0_projection, ra_corn1, dec_corn1, ra_corn2,
-            dec_corn2, ra_corn3, dec_corn3, ra_corn4, dec_corn4, pixel_scale,
-            ra_projection_center, dec_projection_center, 
-            orientat_projection_center, s_region ]
+required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time,
+            mean_exposure_time, visit, segment, pass, survey, optical_element, 
+            instrument, telescope, location_name, product_type ]
 ...
diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml
@@ -18,7 +18,7 @@ properties:
           # Placeholder for 'asn' schema tag
           # Placeholder for 'dither' schema tag
           basic:
-            tag: asdf://stsci.edu/datamodels/roman/tags/mosiac_basic-1.0.0
+            tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0
           individual_image_meta:
             tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0
           program:
@@ -27,7 +27,7 @@ properties:
             tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0
           wcsinfo:
             tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0
-        required: [individual_image_meta, program, resample, wcsinfo]
+        required: [basic, individual_image_meta, program, resample, wcsinfo]
   data:
     title: Science data, excluding border reference pixels.
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
@@ -38,7 +38,7 @@ properties:
         ndim: 2
       unit:
         tag: tag:astropy.org:astropy/units/unit-1.0.0
-        enum: ["electron / s"]
+        enum: ["MJy.sr**-1"]
   err:
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
     properties:
@@ -48,7 +48,7 @@ properties:
         ndim: 2
       unit:
         tag: tag:astropy.org:astropy/units/unit-1.0.0
-        enum: ["electron / s"]
+        enum: ["MJy.sr**-1"]
   context:
     tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
     datatype: uint32
@@ -66,7 +66,7 @@ properties:
         ndim: 2
       unit:
         tag: tag:astropy.org:astropy/units/unit-1.0.0
-        enum: ["electron2 / s2"]
+        enum: ["MJy**-2.sr**-2"]
   var_rnoise:
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
     properties:
@@ -76,7 +76,7 @@ properties:
         ndim: 2
       unit:
         tag: tag:astropy.org:astropy/units/unit-1.0.0
-        enum: ["electron2 / s2"]
+        enum: ["MJy**-2.sr**-2"]
   var_flat:
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
     properties:
@@ -86,7 +86,7 @@ properties:
         ndim: 2
       unit:
         tag: tag:astropy.org:astropy/units/unit-1.0.0
-        enum: ["electron2 / s2"]
+        enum: ["MJy**-2.sr**-2"]
   cal_logs:
     tag: asdf://stsci.edu/datamodels/roman/tags/cal_logs-1.0.0
 propertyOrder: [meta, data, context, err, weight, var_poisson, var_rnoise, var_flat,