Merge branch 'main' into RAD-170_FixTVACFPSdbDestinations

PaulHuwe · May 14, 2024 · 707adc7 · 707adc7
2 parents a7c7804 + c9d7381
commit 707adc7
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 18 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,12 @@
 
 - Fixed the TVAC & FPS archive catalog destinations. [#424]
 
+- Added statistics schemas to both FPS and TVAC. [#423]
+
+- Removed filepath_level_pnt5 from TVAC/FPS database. [#422]
+
+- Removed the db entries for filename_l1a and filename_pnt5 in TVAC and FPS schemas. [#421]
+
 
 0.19.4 (2024-05-08)
 -------------------

diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml
@@ -329,6 +329,11 @@ tags:
   title: FPS Guidestar information
   description: |-
     FPS Guidestar information
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps/statistics-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps/statistics-1.0.0
+  title: FPS Summary Statistics
+  description: |-
+    FPS Summary Statistics
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps/ref_file-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps/ref_file-1.0.0
   title: FPS Calibration reference file names.
@@ -406,6 +411,11 @@ tags:
   title: TVAC Guidestar information
   description: |-
     TVAC Guidestar information
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/tvac/statistics-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tvac/statistics-1.0.0
+  title: TVAC Summary Statistics
+  description: |-
+    TVAC Summary Statistics
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/tvac/ref_file-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tvac/ref_file-1.0.0
   title: TVAC Calibration reference file names.

diff --git a/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml b/src/rad/resources/schemas/fps/groundtest-1.0.0.yaml
@@ -57,21 +57,12 @@ properties:
   filename_pnt5:
     title: L0.5 File Name
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filename_pnt5]
   filepath_level_pnt5:
     title: L0.5 File Path
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filepath_level_pnt5]
   filename_l1a:
     title: L1A File Name
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filename_l1a]
   detector_id:
     title: SCA Identifier
     type: string

diff --git a/src/rad/resources/schemas/fps/statistics-1.0.0.yaml b/src/rad/resources/schemas/fps/statistics-1.0.0.yaml
@@ -0,0 +1,95 @@
+%YAML 1.1
+---
+$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
+id: asdf://stsci.edu/datamodels/roman/schemas/fps/statistics-1.0.0
+
+
+title: |
+  FPS Summary Statistics
+
+type: object
+properties:
+  mean_counts_per_sec:
+    title: Mean number of counts per second
+    description: |
+      Mean number of counts per second of the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["float64"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN / s"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: float
+      destination: [WFICommon.mean_counts_per_sec]
+  median_counts_per_sec:
+    title: Median number of counts per second
+    description: |
+      Median number of counts per second of the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["float64"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN / s"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: float
+      destination: [WFICommon.median_counts_per_sec]
+  max_counts:
+    title: Maximum number of counts
+    description: |
+      Maximum number of counts in the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["int32"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: int
+      destination: [WFICommon.max_counts]
+  min_counts:
+    title: Minimum number of counts
+    description: |
+      Minimum number of counts in the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["int32"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: int
+      destination: [WFICommon.min_counts]
+propertyOrder: [mean_counts_per_sec, median_counts_per_sec, max_counts, min_counts]
+flowStyle: block
+required: [mean_counts_per_sec, median_counts_per_sec, max_counts, min_counts]
+...
diff --git a/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml b/src/rad/resources/schemas/tvac/groundtest-1.0.0.yaml
@@ -57,21 +57,12 @@ properties:
   filename_pnt5:
     title: L0.5 File Name
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filename_pnt5]
   filepath_level_pnt5:
     title: L0.5 File Path
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filepath_level_pnt5]
   filename_l1a:
     title: L1A File Name
     type: string
-    archive_catalog:
-      datatype: nvarchar(80)
-      destination: [WFICommon.filename_l1a]
   detector_id:
     title: SCA Identifier
     type: string

diff --git a/src/rad/resources/schemas/tvac/statistics-1.0.0.yaml b/src/rad/resources/schemas/tvac/statistics-1.0.0.yaml
@@ -0,0 +1,95 @@
+%YAML 1.1
+---
+$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
+id: asdf://stsci.edu/datamodels/roman/schemas/tvac/statistics-1.0.0
+
+
+title: |
+  TVAC Summary Statistics
+
+type: object
+properties:
+  mean_counts_per_sec:
+    title: Mean number of counts per second
+    description: |
+      Mean number of counts per second of the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["float64"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN / s"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: float
+      destination: [WFICommon.mean_counts_per_sec]
+  median_counts_per_sec:
+    title: Median number of counts per second
+    description: |
+      Median number of counts per second of the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["float64"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN / s"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: float
+      destination: [WFICommon.median_counts_per_sec]
+  max_counts:
+    title: Maximum number of counts
+    description: |
+      Maximum number of counts in the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["int32"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: int
+      destination: [WFICommon.max_counts]
+  min_counts:
+    title: Minimum number of counts
+    description: |
+      Minimum number of counts in the data cube
+    anyOf:
+      - tag: tag:stsci.edu:asdf/unit/quantity-1.*
+        properties:
+          datatype:
+            enum: ["int32"]
+          unit:
+            tag: tag:astropy.org:astropy/units/unit-1.*
+            enum: ["DN"]
+      - type: "null"
+    sdf:
+      special_processing: VALUE_REQUIRED
+      source:
+        origin: TBD
+    archive_catalog:
+      datatype: int
+      destination: [WFICommon.min_counts]
+propertyOrder: [mean_counts_per_sec, median_counts_per_sec, max_counts, min_counts]
+flowStyle: block
+required: [mean_counts_per_sec, median_counts_per_sec, max_counts, min_counts]
+...