SSC MSOS archive search keywords update

changes/700.bugfix.rst

@@ -0,0 +1,2 @@
+Removed 'meta' nesting from MSOS archive search schemas.
+Switched asdf/time tagging to references to asdf/time iso_time

latest/SSC/MSOS/keywords/msos_common.yaml

@@ -8,7 +8,7 @@ extName: SSC
 
 type: object
 properties:
-  INSTRUME:
+  instrume:
     title: Instrument
     description: Instrument used
     type: string
@@ -18,31 +18,31 @@ properties:
       destination:
         [WFIReferenceFrame.instrument_name, MSOSCatalog.instrument_name]
   # The following fields are NOT required, but they would be nice to have as explicitly specified values to fill in for our cross-mission search. If not relevant or not provided these will just be null values at MAST.
-  DETECTOR: # SOC Proposed
+  detector: # SOC Proposed
     title: Detector
     description: The WFI detector name
     type: string
     maxLength: 16
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.detector, MSOSCatalog.detector]
-  APERTURE: # SOC Proposed
+  aperture: # SOC Proposed
     title: Aperture
     description: The WFI aperture name
     type: string
     maxLength: 16
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.aperture, MSOSCatalog.aperture]
-  CALVER: # SOC Proposed
+  calver: # SOC Proposed
     title: Calibration Version
     description: The version of the calibration software used
     type: string
     maxLength: 16
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.detector, MSOSCatalog.detector]
-  OPTICAL_ELEMENT:
+  optical_element:
     allOf:
       - $ref: asdf://stsci.edu/datamodels/roman/schemas/wfi_optical_element-1.2.0
     title: Wide Field Instrument (WFI) Optical Element
@@ -54,4 +54,4 @@ properties:
       destination:
         [WFIReferenceFrame.optical_element, MSOSCatalog.optical_element]
 
-required: [INSTRUME, DETECTOR, APERTURE, CALVER, OPTICAL_ELEMENT]
+required: [instrume, detector, aperture, calver, optical_element]

latest/SSC/MSOS/keywords/msos_exposure.yaml

@@ -8,42 +8,44 @@ extName: SSC
 
 type: object
 properties:
-  EXPTIME:
+  exptime:
     title: Exposure Time
     description: Effective (total) exposure time (seconds)
     type: number
     archive_catalog:
       datatype: float
       destination: [WFIReferenceFrame.exposure_time]
   # For both the Roman WFI Search and the MAST Cross-Mission Search, sending these fields will permit time-range-based searches.
-  EXPSTART: # SOC Proposed
+  expstart: # SOC Proposed
     title: Start Time
     description: Start time of first observation that went into the stack (UTC)
-    tag: tag:stsci.edu:asdf/time/time-1.*
+    allOf:
+      - $ref: http://stsci.edu/schemas/asdf/time/time-1.3.0#/definitions/iso_time
     archive_catalog:
       datatype: datetime2
       destination: [WFIReferenceFrame.start_time]
-  EXPEND: # SOC Proposed
+  expend: # SOC Proposed
     title: End Time
     description: End time of last observation that went into stack (UTC)
-    tag: tag:stsci.edu:asdf/time/time-1.*
+    allOf:
+      - $ref: http://stsci.edu/schemas/asdf/time/time-1.3.0#/definitions/iso_time
     archive_catalog:
       datatype: datetime2
       destination: [WFIReferenceFrame.end_time]
   # NOTE: MAST uses MJD for start and end times in our cross-mission search. We can convert from datetime strings, but if they are included in the manifest separately it would eliminate the need to do the conversion on the MAST side.
-  MJDSTART: # SOC Proposed
+  mjdstart: # SOC Proposed
     title: Start Time MJD
     description: Start time of first observation that went into the stack (MJD)
     type: number
     archive_catalog:
       datatype: float
       destination: [WFIReferenceFrame.start_time_mjd]
-  MJDEND: # SOC Proposed
+  mjdend: # SOC Proposed
     title: End Time MJD
     description: End time of last observation that went into the stack (MJD)
     type: number
     archive_catalog:
       datatype: float
       destination: [WFIReferenceFrame.end_time_mjd]
 
-required: [EXPTIME, EXPSTART, EXPEND, MJDSTART, MJDEND]
+required: [exptime, expstart, expend, mjdstart, mjdend]

latest/SSC/MSOS/keywords/msos_exposure_catalog.yaml

@@ -8,42 +8,44 @@ extName: SSC
 
 type: object
 properties:
-  EXPTIME:
+  exptime:
     title: Exposure Time
     description: Cadence of photometric measurements for light curve (seconds)
     type: number
     archive_catalog:
       datatype: float
       destination: [MSOSCatalog.exposure_time]
   # For both the Roman WFI Search and the MAST Cross-Mission Search, sending these fields will permit time-range-based searches.
-  EXPSTART: # SOC Proposed
+  expstart: # SOC Proposed
     title: Start Time
     description: First timestamp in the light curve (UTC)
-    tag: tag:stsci.edu:asdf/time/time-1.*
+    allOf:
+      - $ref: http://stsci.edu/schemas/asdf/time/time-1.3.0#/definitions/iso_time
     archive_catalog:
       datatype: datetime2
       destination: [MSOSCatalog.start_time]
-  EXPEND: # SOC Proposed
+  expend: # SOC Proposed
     title: End Time
     description: Last timestamp in the light curve (UTC)
-    tag: tag:stsci.edu:asdf/time/time-1.*
+    allOf:
+      - $ref: http://stsci.edu/schemas/asdf/time/time-1.3.0#/definitions/iso_time
     archive_catalog:
       datatype: datetime2
       destination: [MSOSCatalog.end_time]
   # NOTE: MAST uses MJD for start and end times in our cross-mission search. We can convert from datetime strings, but if they are included in the manifest separately it would eliminate the need to do the conversion on the MAST side.
-  MJDSTART: # SOC Proposed
+  mjdstart: # SOC Proposed
     title: Start Time MJD
     description: First timestamp in the light curve (MJD)
     type: number
     archive_catalog:
       datatype: float
       destination: [MSOSCatalog.start_time_mjd]
-  MJDEND: # SOC Proposed
+  mjdend: # SOC Proposed
     title: End Time MJD
     description: Last timestamp in the light curve (MJD)
     type: number
     archive_catalog:
       datatype: float
       destination: [MSOSCatalog.end_time_mjd]
 
-required: [EXPTIME, EXPSTART, EXPEND, MJDSTART, MJDEND]
+required: [exptime, expstart, expend, mjdstart, mjdend]

latest/SSC/MSOS/keywords/msos_observation.yaml

@@ -8,14 +8,24 @@ extName: SSC
 type: object
 properties:
   time_mean:
-    title: Mean Time of the Product
+    title: Mean Time of the Product (UTC)
     description: >
       The Universal Coordinated Time (UTC) mean start
       time of the exposures used to create the product.
-    tag: tag:stsci.edu:asdf/time/time-1.*
+    allOf:
+      - $ref: http://stsci.edu/schemas/asdf/time/time-1.3.0#/definitions/iso_time
     archive_catalog:
       datatype: datetime2
       destination: [MSOSCatalog.time_mean]
+  time_mean_mjd:
+    title: Mean Time of the Product (MJD)
+    description: >
+      The MJD mean start
+      time of the exposures used to create the product.
+    type: number
+    archive_catalog:
+      datatype: float
+      destination: [MSOSCatalog.time_mean_mjd]
   max_exposure_time:
     title: Maximum Exposure Time (s)
     description: >
@@ -34,4 +44,4 @@ properties:
       datatype: float
       destination: [MSOSCatalog.mean_exposure_time]
 
-required: [time_mean, max_exposure_time, mean_exposure_time]
+required: [time_mean, time_mean_mjd, max_exposure_time, mean_exposure_time]

latest/SSC/MSOS/keywords/msos_pointing.yaml

@@ -8,29 +8,29 @@ extName: SSC
 
 type: object
 properties:
-  RA:
+  ra:
     title: RA (J2000)
     description: Right Ascension (J2000), from 0 to 360, in degrees
     type: number
     archive_catalog:
       datatype: float
       destination: [WFIReferenceFrame.ra_ref]
-  DEC:
+  dec:
     title: Dec (J2000)
     description: Declination (J2000), from -90 to +90, in degrees
     type: number
     archive_catalog:
       datatype: float
       destination: [WFIReferenceFrame.dec_ref]
-  TARGET:
+  target:
     title: Target Name
     description: Name of the source pointed at by the telescope
     type: string
     maxLength: 256
     archive_catalog:
       datatype: nvarchar(256)
       destination: [WFIReferenceFrame.target_name]
-  REFFRAME: # SOC Proposed
+  refframe: # SOC Proposed
     # This is optional, if not provided MAST will just assume ICRS, but best to explicitly provide.
     title: Reference Frame
     description: The coordinate system used to define the reference frame
@@ -39,7 +39,7 @@ properties:
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.reference_frame]
-  EQUINOX: # SOC Proposed
+  equinox: # SOC Proposed
     # This is optional, if not provided MAST will just assume 2000.0, but best to explicitly provide.
     title: Equinox
     description: The equinox of the coordinates
@@ -48,4 +48,4 @@ properties:
       datatype: float
       destination: [WFIReferenceFrame.equinox]
 
-required: [RA, DEC, TARGET, REFFRAME, EQUINOX]
+required: [ra, dec, target, refframe, equinox]

latest/SSC/MSOS/keywords/msos_program.yaml

@@ -7,15 +7,14 @@ title: MSOS program keywords
 extName: SSC
 type: object
 properties:
-  PROGNUM:
+  prognum:
     title: Program number
     description: ID number (integer) assigned to the proposal
-    type: string
-    maxLength: 16
+    type: integer
     archive_catalog:
-      datatype: nvarchar(16)
+      datatype: int
       destination: [WFIReferenceFrame.program, MSOSCatalog.program]
-  PINAME:
+  piname:
     title: PI Last Name
     description: |
       Principal Investigator (PI) last name; uppercase (e.g., FORD, LEMMON)
@@ -24,15 +23,15 @@ properties:
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.pi_name, MSOSCatalog.pi_name]
-  PROGTITLE:
+  progtitle:
     title: Program Title
     description: The title of the program
     type: string
     maxLength: 16
     archive_catalog:
       datatype: nvarchar(16)
       destination: [WFIReferenceFrame.program_title, MSOSCatalog.program_title]
-  CATEGORY:
+  category:
     title: Program Category
     description: |
       The submitted proposal category of the program. The
@@ -47,7 +46,7 @@ properties:
     archive_catalog:
       datatype: nvarchar(6)
       destination: [WFIReferenceFrame.category, MSOSCatalog.category]
-  SUBCATEGORY:
+  subcategory:
     title: Program Subcategory
     description: |
       The submitted proposal subcategory of the program. The
@@ -65,7 +64,7 @@ properties:
       datatype: nvarchar(15)
       destination:
         [WFIReferenceFrame.program_subcategory, MSOSCatalog.program_subcategory]
-  SCIENCE_CATEGORY:
+  science_category:
     title: Science Category
     description: |
       The science category assigned during the Time
@@ -77,4 +76,4 @@ properties:
       destination:
         [WFIReferenceFrame.science_category, MSOSCatalog.science_category]
 
-required: [PROGNUM, PINAME, PROGTITLE, CATEGORY, SUBCATEGORY, SCIENCE_CATEGORY]
+required: [prognum, piname, progtitle, category, subcategory, science_category]

latest/SSC/MSOS/keywords/msos_reference_frame.yaml

@@ -7,31 +7,15 @@ title: MSOS Reference Frame keywords
 extName: SSC
 type: object
 properties:
-  FLIP:
-    title: Flip
-    description: Placeholder.  Example value '1'
-    type: string
-    maxLength: 8
-    archive_catalog:
-      datatype: nvarchar(8)
-      destination: [WFIReferenceFrame.flip]
-  FIELD:
+  field:
     title: Field
     description: Placeholder.  Example value '5'
     type: string
     maxLength: 128
     archive_catalog:
       datatype: nvarchar(128)
       destination: [WFIReferenceFrame.field]
-  SEQUENCE:
-    title: Sequence
-    description: Placeholder.  Example value '3'
-    type: string
-    maxLength: 10
-    archive_catalog:
-      datatype: nvarchar(10)
-      destination: [WFIReferenceFrame.sequence]
-  TILE_ID:
+  tile_id:
     title: Tile Id
     description: Placeholder.  Example value '35'
     type: string
@@ -40,4 +24,4 @@ properties:
       datatype: nvarchar(10)
       destination: [WFIReferenceFrame.tile_id]
 
-required: [FLIP, FIELD, SEQUENCE, TILE_ID]
+required: [field, tile_id]

latest/SSC/MSOS/keywords/msos_region.yaml

@@ -11,12 +11,12 @@ extName: SSC
 # Example: POLYGON ICRS 270.319355102 65.974344371 270.322525221 66.097218677 270.012545446 66.097236236 270.012492360 65.974274943
 type: object
 properties:
-  S_REGION: # SOC Proposed
+  s_region: # SOC Proposed
     title: Spatial Footprint
     description: The spatial footprint, represented as a polygon
     type: string
     archive_catalog:
       datatype: nvarchar(max)
-      destination: [WFIReferenceFrame.s_region]
+      destination: [WFIReferenceFrame.s_region, MSOSCatalog.s_region]
 
-required: [S_REGION]
+required: [s_region]