Re-organize some of the schemas

spacetelescope · Feb 5, 2024 · 1b910dc · 1b910dc
1 parent b3c2e87
commit 1b910dc
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 230 deletions.
diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml
@@ -156,11 +156,16 @@ tags:
   title: Guidestar information
   description: |-
     Guidestar information
-- tag_uri: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0
-  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/groundtest-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/groundtest-1.0.0
   title: Ground Test Information
   description: |-
     Ground test description.
+- tag_uri: asdf://stsci.edu/datamodels/roman/tags/tvac_groundtest-1.0.0
+  schema_uri: asdf://stsci.edu/datamodels/roman/schemas/tvac_groundtest-1.0.0
+  title: TVAC Ground Test Information
+  description: |-
+    TVAC ground test description.
 - tag_uri: asdf://stsci.edu/datamodels/roman/tags/fps-1.0.0
   schema_uri: asdf://stsci.edu/datamodels/roman/schemas/fps-1.0.0
   title: FPS schema

diff --git a/src/rad/resources/schemas/fps-1.0.0.yaml b/src/rad/resources/schemas/fps-1.0.0.yaml
@@ -13,7 +13,14 @@ archive_meta: None
 type: object
 properties:
   meta:
-    $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0
+    allOf:
+      - $ref: asdf://stsci.edu/datamodels/roman/schemas/ground_common-1.0.0
+      - type: object
+        properties:
+          groundtest:
+            tag: asdf://stsci.edu/datamodels/roman/tags/groundtest-1.0.0
+        required: [groundtest]
+
   data:
     title: Science data, including the border reference pixels.
     tag: tag:stsci.edu:asdf/unit/quantity-1.1.0

diff --git a/src/rad/resources/schemas/ground_common-1.0.0.yaml b/src/rad/resources/schemas/ground_common-1.0.0.yaml
@@ -17,8 +17,6 @@ allOf:
       tag: asdf://stsci.edu/datamodels/roman/tags/ground_exposure-1.0.0
     guidestar:
       tag: asdf://stsci.edu/datamodels/roman/tags/ground_guidestar-1.0.0
-    groundtest:
-      tag: asdf://stsci.edu/datamodels/roman/tags/ground_groundtest-1.0.0
     instrument:
       tag: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0
     ref_file:

diff --git a/...rces/schemas/ground_groundtest-1.0.0.yaml → ...d/resources/schemas/groundtest-1.0.0.yaml b/...rces/schemas/ground_groundtest-1.0.0.yaml → ...d/resources/schemas/groundtest-1.0.0.yaml
@@ -1,7 +1,7 @@
 %YAML 1.1
 ---
 $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
-id: asdf://stsci.edu/datamodels/roman/schemas/ground_groundtest-1.0.0
+id: asdf://stsci.edu/datamodels/roman/schemas/groundtest-1.0.0
 
 title: Ground Test Information
 type: object

diff --git a/src/rad/resources/schemas/tvac-1.0.0.yaml b/src/rad/resources/schemas/tvac-1.0.0.yaml
@@ -18,230 +18,8 @@ properties:
       - type: object
         properties:
           groundtest:
-            type: object
-            properties:
-              activity_number:
-                title: TVAC Activity Number
-                type: integer
-              led_bank1_band_number_on:
-                title: Band number of LED illuminating in the sRCS in bank 1
-                type: array
-                items:
-                  type: integer
-              led_bank2_band_number_on:
-                title: Band number of LED illuminating in the sRCS in bank 2
-                type: array
-                items:
-                  type: integer
-              led_bank1_approx_wlen:
-                title: Approximate wavelength of LED illuminating in the sRCS in bank 1
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  value:
-                    tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
-                    # needs a datatype and ndim
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: ["nm"]
-              led_bank2_approx_wlen:
-                title: Approximate wavelength of LED illuminating in the sRCS in bank 2
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  value:
-                    tag: tag:stsci.edu:asdf/core/ndarray-1.0.0
-                    # needs a datatype and ndim
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: ["nm"]
-              srcs_pd_voltage:
-                title: sRCS Photodiode Voltage
-                type: number
-              srcs_led_flux:
-                title: Target flux for the sRCS LEDs
-                type: number
-              wfi_mce_srcs_bank1_led_i:
-                title: |
-                  Commanded current for the SRCS -> GSFC will send us the flux
-                  in target e-/s/px in the center of the sca
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    # enum: [] # needs a list of units
-              wfi_mce_srcs_bank1_led_range:
-                title: |
-                  Commanded range for the SRCS -> GSFC will send us the flux in
-                  target e-/s/px in the center of the sca
-                type: string
-                # enum: [] add enum values
-              wfi_mce_srcs_bank2_led_i:
-                title: |
-                  Commanded current for the SRCS -> GSFC will send us the flux
-                  in target e-/s/px in the center of the sca
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    # enum: [] # needs a list of units
-              wfi_mce_srcs_bank2_led_range:
-                title: |
-                  Commanded range for the SRCS -> GSFC will send us the flux in
-                  target e-/s/px in the center of the sca
-                type: string
-                # enum: [] add enum values
-              srcs_led_current:
-                title: Input LED current set point
-                type: number
-              wfi_opt_targettype:
-                title: WFI-team defined target types
-                type: string
-                enum: [NONE, FLAT-sRCS, FLAT-SORC, POINT SOURCE, SPECTRUM, DARK,
-                       DARK-DARKEL, DARK-W146, PHARET-GW, PHARET-FF, PHARET-FF-F158,
-                       PHARET-FF-M3MM, PHARET-FF-M6MM, PHARET-FF-P3MM, PHARET-FF-P6MM,
-                       PHARET-FF-PRISM, PHARET-FF-W146, POINT-SOURCE-GW, STRAY LIGHT]
-              analysis_tag:
-                title: WFI-team defined tags for data aggregation/analysis
-                type: string
-              gsorc_pose_mode:
-                title: SORC pose mode
-                type: string
-                # enum: [] add enum values
-              gsorc_pose_target:
-                title: SORC pose target
-                type: string
-                # enum: [] add enum values
-              gsorc_sds_active_atten:
-                title: Attenuation from SDS
-                type: number
-              gsorc_sds_lltfir_wave:
-                title: Commanded wavelength for the LLTF
-              gsorc_sds_sorc_on:
-                title: SORC on/off
-                type: boolean
-              gsorc_sds_sorc_wlen:
-                title: SORC wavelength
-                type: number
-              gsorc_sds_active_source:
-                title: Laser name
-                type: string
-              gsorc_sds_dq_pulse:
-                title: whether the source is pulsing or not
-                type: string
-                enum: [pulse, cw]
-              gsorc_sds_daq_pw:
-                title: pulse width – originally in HDF5 file is in units of 0.1 ms
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [ms]
-              gsorc_heater1_setpt:
-                title: SORC temperature set point
-                type: number
-              wfi_otp_wfi_ewa:
-                title: Element Wheel position
-                type: string
-                # enum: [] add enum values
-              sca_temp:
-                title: SCE temperature
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              mpa_temp:
-                title: MPA temperature
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              ewa_temp:
-                title: ewa temp ish (there's no actual temperature sensor inside)
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              ewta_outer_heater_temp:
-                title: ewa_outer temperature sensor
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              ewta_inner_heater_temp:
-                title: ewa_inner temperature sensor
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              coba_temp_near_ewta:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              scea_temp:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
-              wfi_sce_1_vbiasgate_v:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [V]
-              wfi_sce_1_vbiaspwr_i:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [A]
-              wfi_sce_1_vbiaspwr_v:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [V]
-              wfi_sce_1_vreset_v:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [V]
-              wfi_sce_1_vreset_i:
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [A]
-              wfi_mcu_a_offs_csense_fpssen:
-                title: temperature in eng units -> will change for TVAC2.
-                tag: tag:stsci.edu:asdf/unit/quantity-1.1.0
-                properties:
-                  # needs a datatype
-                  unit:
-                    tag: tag:stsci.edu:asdf/unit/unit-1.0.0
-                    enum: [K]
+            tag: asdf://stsci.edu/datamodels/roman/tags/tvac_groundtest-1.0.0
+        required: [groundtest]
 
   data:
     title: Science data, including the border reference pixels.