From a46d9ae0bef68ba8bc32c6fd4f26b13df3455fce Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 25 Oct 2023 21:55:48 -0400 Subject: [PATCH 01/29] Save --- .../resources/schemas/hlpp_basic-1.0.0.yaml | 42 +++ .../resources/schemas/hlpp_wcsinfo-1.0.0.yaml | 240 ++++++++++++++++++ .../schemas/individual_image_meta-1.0.0.yaml | 21 ++ src/rad/resources/schemas/resample-1.0.0.yaml | 2 +- .../resources/schemas/wfi_mosaic-1.0.0.yaml | 13 +- 5 files changed, 312 insertions(+), 6 deletions(-) create mode 100644 src/rad/resources/schemas/hlpp_basic-1.0.0.yaml create mode 100644 src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml create mode 100644 src/rad/resources/schemas/individual_image_meta-1.0.0.yaml diff --git a/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml b/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml new file mode 100644 index 00000000..e677601a --- /dev/null +++ b/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml @@ -0,0 +1,42 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0 + +title: Common metadata keywords + +type: object +properties: + # Meta Variables + time_first_mjd: + tag: asdf://stsci.edu/datamodels/roman/tags/time_first_mjd-1.0.0 + time_last_mjd: + tag: asdf://stsci.edu/datamodels/roman/tags/time_last_mjd-1.0.0 + time_mean_mjd: + tag: asdf://stsci.edu/datamodels/roman/tags/time_mean_mjd-1.0.0 + max_exposure_time: + tag: asdf://stsci.edu/datamodels/roman/tags/max_exposure_time-1.0.0 + mean_exposure_time: + tag: asdf://stsci.edu/datamodels/roman/tags/mean_exposure_time-1.0.0 + visit: + tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 + segment: + tag: asdf://stsci.edu/datamodels/roman/tags/segment-1.0.0 + pass: + tag: asdf://stsci.edu/datamodels/roman/tags/pass-1.0.0 + survey: + tag: asdf://stsci.edu/datamodels/roman/tags/survey-1.0.0 + optical_element: + tag: asdf://stsci.edu/datamodels/roman/tags/optical_element-1.0.0 + instrument: + tag: asdf://stsci.edu/datamodels/roman/tags/instrument-1.0.0 + telescope: + tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0 + location_name: + tag: asdf://stsci.edu/datamodels/roman/tags/location_name-1.0.0 + product_type: + tag: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0 +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/hlpp_wcsinfo-1.0.0.yaml b/src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml new file mode 100644 index 00000000..85e76a91 --- /dev/null +++ b/src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml @@ -0,0 +1,240 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/wcsinfo-1.0.0 + +title: WCS parameters +type: object +properties: + ra_center: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_center] + dec_center: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_center] + x_center: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.x_center] + y_center: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.y_center] + orientat: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.orientat] + nx: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.nx] + ny: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.ny] + x0_projection: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.x0_projection] + y0_projection: + title: + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.y0_projection] + ra_corn1: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_corn1] + dec_corn1: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_corn1] + ra_corn2: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_corn2] + dec_corn2: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_corn2] + ra_corn3: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_corn3] + dec_corn3: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_corn3] + ra_corn4: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_corn4] + dec_corn4: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_corn4] + pixel_scale: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.pixel_scale] + ra_projection_center: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.ra_projection_center] + dec_projection_center: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.dec_projection_center] + orientat_projection_center: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.orientat_projection_center] + s_region: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.s_region] +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 ] +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 ] +... 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 new file mode 100644 index 00000000..8cb5c857 --- /dev/null +++ b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml @@ -0,0 +1,21 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/individual_image_meta-1.0.0 + +title: + +datamodel_name: individual_image_meta + +type: object +properties: + all_meta: + description: | + A list of columns in the table. + type: array + items: + $ref: column-1.1.0 +required: [all_meta] +flowStyle: block +propertyOrder: [all_meta] +... diff --git a/src/rad/resources/schemas/resample-1.0.0.yaml b/src/rad/resources/schemas/resample-1.0.0.yaml index f6796f3f..70ddea7b 100644 --- a/src/rad/resources/schemas/resample-1.0.0.yaml +++ b/src/rad/resources/schemas/resample-1.0.0.yaml @@ -24,5 +24,5 @@ properties: enum: ["exptime", "ivm"] propertyOrder: [pixel_scale_ratio, pixfrac, pointings, product_exposure_time, weight_type] flowStyle: block -required: [pixel_scale_ratio, pixfrac, pointings, product_exposure_time, weight_type] +required: [pixel_scale_ratio, pixfrac, weight_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 index dd64d137..0491482a 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -7,23 +7,26 @@ title: | The schema for WFI Level 3 mosaics. datamodel_name: MosaicModel - archive_meta: None type: object properties: meta: allOf: - - $ref: common-1.0.0 + - $ref: hlpp_basic-1.0.0 - type: object properties: # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag - photometry: - tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 + individual_image_meta: + tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 + program: + tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 resample: tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0 - required: [photometry] + wcsinfo: + tag: asdf://stsci.edu/datamodels/roman/tags/hlpp_wcsinfo-1.0.0 + required: [individual_image_meta, program, resample, wcsinfo] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 From 75414b06a74e200fa7c20100f5dea4b8cfadc951 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 26 Oct 2023 11:16:39 -0400 Subject: [PATCH 02/29] Save --- .../resources/manifests/datamodels-1.0.yaml | 10 ++ .../resources/schemas/hlpp_basic-1.0.0.yaml | 42 ----- .../schemas/individual_image_meta-1.0.0.yaml | 4 +- .../resources/schemas/mosaic_basic-1.0.0.yaml | 154 ++++++++++++++++++ ...o-1.0.0.yaml => mosaic_wcsinfo-1.0.0.yaml} | 4 +- .../resources/schemas/wfi_mosaic-1.0.0.yaml | 5 +- 6 files changed, 171 insertions(+), 48 deletions(-) delete mode 100644 src/rad/resources/schemas/hlpp_basic-1.0.0.yaml create mode 100644 src/rad/resources/schemas/mosaic_basic-1.0.0.yaml rename src/rad/resources/schemas/{hlpp_wcsinfo-1.0.0.yaml => mosaic_wcsinfo-1.0.0.yaml} (98%) diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index f694575c..8bc377fd 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -125,6 +125,16 @@ tags: title: Resample information description: |- Resample information +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/individual_image_meta-1.0.0 + title: Combined level 2 metadata + description: |- + Combined level 2 metadata +- 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 + title: Mosaic WCS parameters + description: |- + Mosaic WCS parameters # Reference Modules - tag_uri: asdf://stsci.edu/datamodels/roman/tags/reference_files/dark-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/reference_files/dark-1.0.0 diff --git a/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml b/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml deleted file mode 100644 index e677601a..00000000 --- a/src/rad/resources/schemas/hlpp_basic-1.0.0.yaml +++ /dev/null @@ -1,42 +0,0 @@ -%YAML 1.1 ---- -$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/basic-1.0.0 - -title: Common metadata keywords - -type: object -properties: - # Meta Variables - time_first_mjd: - tag: asdf://stsci.edu/datamodels/roman/tags/time_first_mjd-1.0.0 - time_last_mjd: - tag: asdf://stsci.edu/datamodels/roman/tags/time_last_mjd-1.0.0 - time_mean_mjd: - tag: asdf://stsci.edu/datamodels/roman/tags/time_mean_mjd-1.0.0 - max_exposure_time: - tag: asdf://stsci.edu/datamodels/roman/tags/max_exposure_time-1.0.0 - mean_exposure_time: - tag: asdf://stsci.edu/datamodels/roman/tags/mean_exposure_time-1.0.0 - visit: - tag: asdf://stsci.edu/datamodels/roman/tags/visit-1.0.0 - segment: - tag: asdf://stsci.edu/datamodels/roman/tags/segment-1.0.0 - pass: - tag: asdf://stsci.edu/datamodels/roman/tags/pass-1.0.0 - survey: - tag: asdf://stsci.edu/datamodels/roman/tags/survey-1.0.0 - optical_element: - tag: asdf://stsci.edu/datamodels/roman/tags/optical_element-1.0.0 - instrument: - tag: asdf://stsci.edu/datamodels/roman/tags/instrument-1.0.0 - telescope: - tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0 - location_name: - tag: asdf://stsci.edu/datamodels/roman/tags/location_name-1.0.0 - product_type: - tag: asdf://stsci.edu/datamodels/roman/tags/product_type-1.0.0 -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/individual_image_meta-1.0.0.yaml b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml index 8cb5c857..297dc2e5 100644 --- a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml +++ b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml @@ -3,9 +3,9 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/individual_image_meta-1.0.0 -title: +title: Combined level 2 metadata -datamodel_name: individual_image_meta +datamodel_name: IndividualImageMetaModel type: object properties: diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml new file mode 100644 index 00000000..97ee1c96 --- /dev/null +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -0,0 +1,154 @@ +%YAML 1.1 +--- +$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 +type: object + +properties: + time_first_mjd: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.time_first_mjd] + time_last_mjd: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.time_last_mjd] + time_mean_mjd: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.time_mean_mjd] + max_exposure_time: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.max_exposure_time] + mean_exposure_time: + title: + type: number + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: float + destination: [ScienceCommon.mean_exposure_time] + visit: + title: Visit number within the observation, defined range of values is 1..999; included in + obs_id and visit_id as 'VVV'. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: smallint + destination: [ScienceCommon.visit] + segment: + title: Segment Number within pass, defined range is 1..999; included in obs_id and visit_id as + 'SSS'. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: smallint + destination: [ScienceCommon.segment] + pass: + title: Pass number within execution plan, defined range is 1..999; included in obs_id and + visit_id as 'AA'. + type: integer + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: smallint + destination: [ScienceCommon.pass] + survey: + title: Observation Survey + type: string + enum: [HLS, EMS, SN, N/A] + archive_catalog: + datatype: nvarchar(15) + destination: [ScienceCommon.survey] + optical_element: + $ref: wfi_optical_element-1.0.0 + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(20) + destination: [ScienceCommon.optical_element] + instrument: + title: Instrument used to acquire the data + type: string + enum: [WFI] + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(5) + destination: [ScienceCommon.instrument_name] + telescope: + tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0 + location_name: + title: + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(25) + destination: [ScienceCommon.location_name] + product_type: + title: + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + 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 ] +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 ] +... diff --git a/src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml similarity index 98% rename from src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml rename to src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml index 85e76a91..c7d631ad 100644 --- a/src/rad/resources/schemas/hlpp_wcsinfo-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml @@ -1,9 +1,9 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/wcsinfo-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosiac_wcsinfo-1.0.0 -title: WCS parameters +title: Mosiac WCS parameters type: object properties: ra_center: diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 0491482a..5baeaf06 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -13,11 +13,12 @@ type: object properties: meta: allOf: - - $ref: hlpp_basic-1.0.0 - type: object properties: # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag + basic: + tag: asdf://stsci.edu/datamodels/roman/tags/mosiac_basic-1.0.0 individual_image_meta: tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 program: @@ -25,7 +26,7 @@ properties: resample: tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0 wcsinfo: - tag: asdf://stsci.edu/datamodels/roman/tags/hlpp_wcsinfo-1.0.0 + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 required: [individual_image_meta, program, resample, wcsinfo] data: title: Science data, excluding border reference pixels. From bf2556dc0583593f305c3651c443d945353dc61d Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 26 Oct 2023 13:53:25 -0400 Subject: [PATCH 03/29] Initial push. --- .../resources/manifests/datamodels-1.0.yaml | 7 ++++++- .../schemas/individual_image_meta-1.0.0.yaml | 4 +--- .../resources/schemas/mosaic_basic-1.0.0.yaml | 18 +++++++----------- .../resources/schemas/wfi_mosaic-1.0.0.yaml | 14 +++++++------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 8bc377fd..202237ad 100644 --- 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 index 297dc2e5..e767be4d 100644 --- 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 index 97ee1c96..81abf436 100644 --- 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 index 5baeaf06..673e55ad 100644 --- 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, From f393cc6223546bfae9b6151fb20c293328ca2251 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 17:56:35 +0000 Subject: [PATCH 04/29] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 4 ++-- src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 81abf436..82316d4a 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -141,10 +141,10 @@ properties: destination: [ScienceCommon.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, survey, optical_element, + mean_exposure_time, visit, segment, pass, survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, survey, optical_element, + mean_exposure_time, visit, segment, pass, survey, optical_element, instrument, telescope, location_name, product_type ] ... diff --git a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml index c7d631ad..0ab76dc7 100644 --- a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml @@ -226,15 +226,15 @@ properties: archive_catalog: datatype: float destination: [ScienceCommon.s_region] -propertyOrder: [ ra_center, dec_center, x_center, y_center, orientat, nx, ny, +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, + ra_projection_center, dec_projection_center, orientat_projection_center, s_region ] flowStyle: block -required: [ ra_center, dec_center, x_center, y_center, orientat, nx, ny, +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, + ra_projection_center, dec_projection_center, orientat_projection_center, s_region ] ... From 03675ae02c76abdde5d342e4c1344e067ecb8731 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 26 Oct 2023 14:05:25 -0400 Subject: [PATCH 05/29] Updated units. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 673e55ad..130d58eb 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -66,7 +66,7 @@ properties: ndim: 2 unit: tag: tag:astropy.org:astropy/units/unit-1.0.0 - enum: ["MJy**-2.sr**-2"] + enum: ["(MJy.sr**-1)**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: ["MJy**-2.sr**-2"] + enum: ["(MJy.sr**-1)**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: ["MJy**-2.sr**-2"] + enum: ["(MJy.sr**-1)**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, From 8d33aca16bde7b0d34adb6aee90b57e87f51e44b Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Thu, 26 Oct 2023 14:46:20 -0400 Subject: [PATCH 06/29] Removed required object. --- src/rad/resources/schemas/individual_image_meta-1.0.0.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 index e767be4d..1e5d4411 100644 --- a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml +++ b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml @@ -5,15 +5,11 @@ id: asdf://stsci.edu/datamodels/roman/schemas/individual_image_meta-1.0.0 title: Combined level 2 metadata -datamodel_name: IndividualImageMetaModel - type: object properties: all_meta: description: | - Table of level 2 metadata. - type: array -required: [all_meta] + Table of level 2 metadata. Placeholder object. flowStyle: block propertyOrder: [all_meta] ... From 8ed33c32bda7ce54c2b4a882bdff2c0dfa5c5451 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 31 Oct 2023 15:03:53 -0400 Subject: [PATCH 07/29] Updated mosaic wcsinfo keywords, added titles, fixed bugs. --- .../resources/manifests/datamodels-1.0.yaml | 8 +- .../resources/schemas/mosaic_basic-1.0.0.yaml | 45 +++-- .../schemas/mosaic_wcsinfo-1.0.0.yaml | 188 +++++++++--------- 3 files changed, 129 insertions(+), 112 deletions(-) diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 202237ad..20bf9e8b 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -36,7 +36,7 @@ tags: Wfi level 2 image information - tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_mosaic-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/wfi_mosaic-1.0.0 - title: Wfi level 3 mosiac information + title: Wfi level 3 mosaic information description: |- Wfi level 3 mosaic information - tag_uri: asdf://stsci.edu/datamodels/roman/tags/wfi_mode-1.0.0 @@ -130,13 +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 +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_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/mocaic_wcsinfo-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_wcsinfo-1.0.0 title: Mosaic WCS parameters description: |- Mosaic WCS parameters diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 82316d4a..561d1da0 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -1,14 +1,14 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/mosiac_basic-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_basic-1.0.0 title: Basic mosaic metadata keywords type: object properties: time_first_mjd: - title: + title: Earliest component image start time in the mosaic in MJD type: number sdf: special_processing: VALUE_REQUIRED @@ -18,7 +18,7 @@ properties: datatype: float destination: [ScienceCommon.time_first_mjd] time_last_mjd: - title: + title: Latest component image end time in the mosaic in MJD type: number sdf: special_processing: VALUE_REQUIRED @@ -28,7 +28,7 @@ properties: datatype: float destination: [ScienceCommon.time_last_mjd] time_mean_mjd: - title: + title: Mean of mid-times of component images in MJD type: number sdf: special_processing: VALUE_REQUIRED @@ -38,7 +38,7 @@ properties: datatype: float destination: [ScienceCommon.time_mean_mjd] max_exposure_time: - title: + title: Maximum component image exposure time in MJD type: number sdf: special_processing: VALUE_REQUIRED @@ -48,7 +48,7 @@ properties: datatype: float destination: [ScienceCommon.max_exposure_time] mean_exposure_time: - title: + title: Mean of component image exposure times in MJD type: number sdf: special_processing: VALUE_REQUIRED @@ -58,8 +58,8 @@ properties: datatype: float destination: [ScienceCommon.mean_exposure_time] visit: - title: Visit number within the observation, defined range of values is 1..999; included in - obs_id and visit_id as 'VVV'. + title: Visit number within the observation, defined range of + values is 1..999; included in obs_id and visit_id as 'VVV'. type: integer sdf: special_processing: VALUE_REQUIRED @@ -69,8 +69,8 @@ properties: datatype: smallint destination: [ScienceCommon.visit] segment: - title: Segment Number within pass, defined range is 1..999; included in obs_id and visit_id as - 'SSS'. + title: Segment Number within pass, defined range is 1..999; + included in obs_id and visit_id as 'SSS'. type: integer sdf: special_processing: VALUE_REQUIRED @@ -80,8 +80,8 @@ properties: datatype: smallint destination: [ScienceCommon.segment] pass: - title: Pass number within execution plan, defined range is 1..999; included in obs_id and - visit_id as 'AA'. + title: Pass number within execution plan, defined range is 1..999; + included in obs_id and visit_id as 'AA'. type: integer sdf: special_processing: VALUE_REQUIRED @@ -90,10 +90,20 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.pass] + program: + title: Program number, defined range is 1..18445; + included in obs_id and visit_id as 'PPPPP'. + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: int + destination: [ScienceCommon.program] survey: title: Observation Survey type: string - enum: [HLS, EMS, SN, N/A] archive_catalog: datatype: nvarchar(15) destination: [ScienceCommon.survey] @@ -120,7 +130,7 @@ properties: telescope: tag: asdf://stsci.edu/datamodels/roman/tags/telescope-1.0.0 location_name: - title: + title: Name of the skycell containing the mosaic type: string sdf: special_processing: VALUE_REQUIRED @@ -130,7 +140,7 @@ properties: datatype: nvarchar(25) destination: [ScienceCommon.location_name] product_type: - title: + title: Association product type type: string sdf: special_processing: VALUE_REQUIRED @@ -139,12 +149,11 @@ properties: archive_catalog: datatype: nvarchar(25) destination: [ScienceCommon.product_type] - propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, survey, optical_element, + mean_exposure_time, visit, segment, pass, program, survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, survey, optical_element, + mean_exposure_time, visit, segment, pass, program, survey, optical_element, instrument, telescope, location_name, product_type ] ... diff --git a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml index 0ab76dc7..917a982d 100644 --- a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml @@ -1,13 +1,14 @@ %YAML 1.1 --- $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 -id: asdf://stsci.edu/datamodels/roman/schemas/mosiac_wcsinfo-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_wcsinfo-1.0.0 -title: Mosiac WCS parameters +title: Mosaic WCS parameters type: object + properties: - ra_center: - title: + ra_ref: + title: "[deg] Projection center RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -15,9 +16,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.ra_center] - dec_center: - title: + destination: [ScienceCommon.ra_ref] + dec_ref: + title: "[deg] Projection center Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -25,9 +26,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_center] - x_center: - title: + destination: [ScienceCommon.dec_ref] + x_ref: + title: Pixel number in mosaic corresponding to projection center ra/dec type: integer sdf: special_processing: VALUE_REQUIRED @@ -35,9 +36,9 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.x_center] - y_center: - title: + destination: [ScienceCommon.x_ref] + y_ref: + title: Pixel number in mosaic corresponding to projection center ra/dec type: integer sdf: special_processing: VALUE_REQUIRED @@ -45,69 +46,78 @@ properties: origin: TBD archive_catalog: datatype: int - destination: [ScienceCommon.y_center] - orientat: - title: - type: number + destination: [ScienceCommon.y_ref] + rotation_matrix: + title: 2x2 rotation matrix + type: array + items: + type: array + items: + type: number sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: float - destination: [ScienceCommon.orientat] - nx: - title: - type: integer + datatype: nvarchar(3500) + destination: [ScienceCommon.rotation_matrix] + pixel_scale: + title: Pixel scale at projection center + type: number sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int - destination: [ScienceCommon.nx] - ny: - title: - type: integer + datatype: float + destination: [ScienceCommon.pixel_scale] + pixel_scale_local: + title: Pixel scale at image center + type: number sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int - destination: [ScienceCommon.ny] - x0_projection: - title: - type: integer + datatype: float + destination: [ScienceCommon.pixel_scale_local] + projection: + title: Projection type and order + type: array + items: + type: string + enum: ["RA---TAN", "DEC--TAN"] sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int - destination: [ScienceCommon.x0_projection] - y0_projection: - title: - type: integer + datatype: nvarchar(50) + destination: [ScienceCommon.projection] + s_region: + title: spatial extent of the observation + type: string sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int - destination: [ScienceCommon.y0_projection] - ra_corn1: - title: - type: number + datatype: nvarchar(max) + destination: [ScienceCommon.s_region] + pixel_shape: + title: Shape of image (nx, ny) + type: array + items: + type: integer sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: float - destination: [ScienceCommon.ra_corn1] - dec_corn1: - title: + datatype: nvarchar(50) + destination: [ScienceCommon.pixel_shape] + ra_center: + title: "[deg] Mosaic center RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -115,9 +125,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_corn1] - ra_corn2: - title: + destination: [ScienceCommon.ra_center] + dec_center: + title: "[deg] Mosaic center Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -125,9 +135,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.ra_corn2] - dec_corn2: - title: + destination: [ScienceCommon.dec_center] + ra_corn1: + title: "[deg] Mosaic corner 1 RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -135,9 +145,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_corn2] - ra_corn3: - title: + destination: [ScienceCommon.ra_corn1] + dec_corn1: + title: "[deg] Mosaic corner 1 Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -145,9 +155,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.ra_corn3] - dec_corn3: - title: + destination: [ScienceCommon.dec_corn1] + ra_corn2: + title: "[deg] Mosaic corner 2 RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -155,9 +165,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_corn3] - ra_corn4: - title: + destination: [ScienceCommon.ra_corn2] + dec_corn2: + title: "[deg] Mosaic corner 2 Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -165,9 +175,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.ra_corn4] - dec_corn4: - title: + destination: [ScienceCommon.dec_corn2] + ra_corn3: + title: "[deg] Mosaic corner 3 RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -175,9 +185,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_corn4] - pixel_scale: - title: + destination: [ScienceCommon.ra_corn3] + dec_corn3: + title: "[deg] Mosaic corner 3 Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -185,9 +195,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.pixel_scale] - ra_projection_center: - title: + destination: [ScienceCommon.dec_corn3] + ra_corn4: + title: "[deg] Mosaic corner 4 RA" type: number sdf: special_processing: VALUE_REQUIRED @@ -195,9 +205,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.ra_projection_center] - dec_projection_center: - title: + destination: [ScienceCommon.ra_corn4] + dec_corn4: + title: "[deg] Mosaic corner 4 Dec" type: number sdf: special_processing: VALUE_REQUIRED @@ -205,9 +215,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.dec_projection_center] - orientat_projection_center: - title: + destination: [ScienceCommon.dec_corn4] + orientat_local: + title: Orientation at mosaic center type: number sdf: special_processing: VALUE_REQUIRED @@ -215,9 +225,9 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.orientat_projection_center] - s_region: - title: + destination: [ScienceCommon.orientat_local] + orientat: + title: Orientation at projection center type: number sdf: special_processing: VALUE_REQUIRED @@ -225,16 +235,14 @@ properties: origin: TBD archive_catalog: datatype: float - destination: [ScienceCommon.s_region] -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 ] + destination: [ScienceCommon.orientat] +propertyOrder: [ ra_ref, dec_ref, x_ref, y_ref, rotation_matrix, pixel_scale, + pixel_scale_local, projection, s_region, pixel_shape, ra_center, + dec_center, ra_corn1, dec_corn1, ra_corn2, dec_corn2, ra_corn3, + dec_corn3, ra_corn4, dec_corn4, orientat_local, orientat ] 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: [ ra_ref, dec_ref, x_ref, y_ref, rotation_matrix, pixel_scale, + pixel_scale_local, projection, s_region, pixel_shape, ra_center, + dec_center, ra_corn1, dec_corn1, ra_corn2, dec_corn2, ra_corn3, + dec_corn3, ra_corn4, dec_corn4, orientat_local, orientat ] ... From dab599391fd8a248e86fa2fa75bd84554891daa9 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 31 Oct 2023 15:36:25 -0400 Subject: [PATCH 08/29] Updated changelog. --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3dc05f0b..c14b011a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,8 @@ - Added optional dq array. [#328] +- Added streamlined Level 3 Mosaic metadata schemas. [#334] + 0.17.1 (2023-08-03) ------------------- From cb2b6f8b639a0de4616ce4612371fbd1255b1be2 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 1 Nov 2023 20:41:21 -0400 Subject: [PATCH 09/29] Adjusted units. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 130d58eb..47b8f738 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -37,7 +37,7 @@ properties: datatype: float32 ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.0.0 + tag: tag:stsci.edu:asdf/unit/unit-1.0.0 enum: ["MJy.sr**-1"] err: tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 @@ -47,7 +47,7 @@ properties: datatype: float32 ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.0.0 + tag: tag:stsci.edu:asdf/unit/unit-1.0.0 enum: ["MJy.sr**-1"] context: tag: tag:stsci.edu:asdf/core/ndarray-1.0.0 @@ -65,8 +65,8 @@ properties: datatype: float32 ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.0.0 - enum: ["(MJy.sr**-1)**2"] + tag: tag:stsci.edu:asdf/unit/unit-1.0.0 + enum: ["MJy**2.sr**-2"] var_rnoise: tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 properties: @@ -75,8 +75,8 @@ properties: datatype: float32 ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.0.0 - enum: ["(MJy.sr**-1)**2"] + tag: tag:stsci.edu:asdf/unit/unit-1.0.0 + enum: ["MJy**2.sr**-2"] var_flat: tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 properties: @@ -85,8 +85,8 @@ properties: datatype: float32 ndim: 2 unit: - tag: tag:astropy.org:astropy/units/unit-1.0.0 - enum: ["(MJy.sr**-1)**2"] + tag: tag:stsci.edu:asdf/unit/unit-1.0.0 + 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, From 034b6fe4652e50b390a82de3dc218f7dcb9618c5 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 7 Nov 2023 13:25:07 -0500 Subject: [PATCH 10/29] Addressed PR comments. --- .../schemas/mosaic_wcsinfo-1.0.0.yaml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml index 917a982d..0964528e 100644 --- a/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_wcsinfo-1.0.0.yaml @@ -29,23 +29,23 @@ properties: destination: [ScienceCommon.dec_ref] x_ref: title: Pixel number in mosaic corresponding to projection center ra/dec - type: integer + type: number sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int + datatype: float destination: [ScienceCommon.x_ref] y_ref: title: Pixel number in mosaic corresponding to projection center ra/dec - type: integer + type: number sdf: special_processing: VALUE_REQUIRED source: origin: TBD archive_catalog: - datatype: int + datatype: float destination: [ScienceCommon.y_ref] rotation_matrix: title: 2x2 rotation matrix @@ -83,10 +83,8 @@ properties: destination: [ScienceCommon.pixel_scale_local] projection: title: Projection type and order - type: array - items: - type: string - enum: ["RA---TAN", "DEC--TAN"] + type: string + enum: ["TAN"] sdf: special_processing: VALUE_REQUIRED source: @@ -217,7 +215,8 @@ properties: datatype: float destination: [ScienceCommon.dec_corn4] orientat_local: - title: Orientation at mosaic center + title: Angle between north and the y axis of the projection at the mosaic + center, turning positive in the direction of increasing right ascenscion. type: number sdf: special_processing: VALUE_REQUIRED @@ -227,7 +226,8 @@ properties: datatype: float destination: [ScienceCommon.orientat_local] orientat: - title: Orientation at projection center + title: Angle between north and the y axis of the projection at the projection + center, turning positive in the direction of increasing right ascenscion. type: number sdf: special_processing: VALUE_REQUIRED From 7e322d3070c42f170fdb6dd79ecac4885eb4b0d0 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Mon, 8 Jan 2024 16:15:59 -0500 Subject: [PATCH 11/29] Changed pass to pass_number. --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 2 +- src/rad/resources/schemas/observation-1.0.0.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 561d1da0..1fee8a1d 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -79,7 +79,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.segment] - pass: + pass_number: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer diff --git a/src/rad/resources/schemas/observation-1.0.0.yaml b/src/rad/resources/schemas/observation-1.0.0.yaml index c30c4274..6384d0c7 100644 --- a/src/rad/resources/schemas/observation-1.0.0.yaml +++ b/src/rad/resources/schemas/observation-1.0.0.yaml @@ -55,7 +55,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.execution_plan, GuideWindow.execution_plan] - pass: + pass_number: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer From 7d44f0b41b57bb5950159b9a2b3a7cb3604d52a5 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Tue, 9 Jan 2024 11:13:37 -0500 Subject: [PATCH 12/29] Updated pass name in required lists --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 4 ++-- src/rad/resources/schemas/observation-1.0.0.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 1fee8a1d..f90d4cb2 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -150,10 +150,10 @@ properties: datatype: nvarchar(25) destination: [ScienceCommon.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, program, survey, optical_element, + mean_exposure_time, visit, segment, pass_number, program, survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, program, survey, optical_element, + mean_exposure_time, visit, segment, pass_number, program, survey, optical_element, instrument, telescope, location_name, product_type ] ... diff --git a/src/rad/resources/schemas/observation-1.0.0.yaml b/src/rad/resources/schemas/observation-1.0.0.yaml index 6384d0c7..e83bb961 100644 --- a/src/rad/resources/schemas/observation-1.0.0.yaml +++ b/src/rad/resources/schemas/observation-1.0.0.yaml @@ -171,13 +171,13 @@ properties: datatype: nvarchar(15) destination: [ScienceCommon.survey, GuideWindow.survey] propertyOrder: [obs_id, visit_id, program, - execution_plan, pass, observation, segment, + execution_plan, pass_number, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey] flowStyle: block required: [obs_id, visit_id, program, - execution_plan, pass, observation, segment, + execution_plan, pass_number, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey] From b175e423910c7986fa02ad71b4f283534f3e1dd5 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Mon, 22 Jan 2024 20:06:14 -0500 Subject: [PATCH 13/29] Added model_type --- .../resources/schemas/mosaic_basic-1.0.0.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index f90d4cb2..f70091d9 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -57,6 +57,16 @@ properties: archive_catalog: datatype: float destination: [ScienceCommon.mean_exposure_time] + model_type: + title: Type of data model + type: string + sdf: + special_processing: VALUE_REQUIRED + source: + origin: TBD + archive_catalog: + datatype: nvarchar(50) + destination: [ScienceCommon.model_type, GuideWindow.model_type] visit: title: Visit number within the observation, defined range of values is 1..999; included in obs_id and visit_id as 'VVV'. @@ -150,10 +160,10 @@ properties: datatype: nvarchar(25) destination: [ScienceCommon.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass_number, program, survey, optical_element, - instrument, telescope, location_name, product_type ] + mean_exposure_time, model_type, visit, segment, pass_number, program, + survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass_number, program, survey, optical_element, - instrument, telescope, location_name, product_type ] + mean_exposure_time, model_type, visit, segment, pass_number, program, + survey, optical_element, instrument, telescope, location_name, product_type ] ... From 1fee3b088f73a286e0ce5d2b1751a3acbe372c18 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 24 Jan 2024 13:35:47 -0500 Subject: [PATCH 14/29] Add Table schema keywords. --- .../schemas/individual_image_meta-1.0.0.yaml | 74 ++++++++++++++++++- tests/test_schemas.py | 1 + 2 files changed, 72 insertions(+), 3 deletions(-) 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 index 1e5d4411..edeeb7df 100644 --- a/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml +++ b/src/rad/resources/schemas/individual_image_meta-1.0.0.yaml @@ -7,9 +7,77 @@ title: Combined level 2 metadata type: object properties: - all_meta: + basic: description: | - Table of level 2 metadata. Placeholder object. + Table of basic level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + aperture: + description: | + Table of aperture level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + cal_step: + description: | + Table of cal_step level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + coordinates: + description: | + Table of coordinates level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + ephemeris: + description: | + Table of ephemeris level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + exposure: + description: | + Table of exposure level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + guidestar: + description: | + Table of guidestar level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + instrument: + description: | + Table of instrument level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + observation: + description: | + Table of observation level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + photometry: + description: | + Table of photometry level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + pointing: + description: | + Table of pointing level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + program: + description: | + Table of program level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + ref_file: + description: | + Table of ref_file level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + target: + description: | + Table of target level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + velocity_aberration: + description: | + Table of velocity_aberration level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + visit: + description: | + Table of visit level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 + wcsinfo: + description: | + Table of wcsinfo level 2 metadata. + tag: tag:astropy.org:astropy/table/table-1.1.0 flowStyle: block -propertyOrder: [all_meta] +propertyOrder: [basic, aperture, cal_step, coordinates, ephemeris, +exposure, guidestar, instrument, observation, photometry, +pointing, program, ref_file, target, velocity_aberration, +visit, wcsinfo] ... diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 19216c23..6d16a098 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -51,6 +51,7 @@ def valid_tag_uris(manifest): "tag:stsci.edu:asdf/unit/quantity-1.1.0", "tag:stsci.edu:asdf/unit/unit-1.0.0", "tag:astropy.org:astropy/units/unit-1.0.0", + "tag:astropy.org:astropy/table/table-1.1.0", "tag:stsci.edu:gwcs/wcs-1.0.0", "tag:stsci.edu:gwcs/wcs-1.1.0", "tag:stsci.edu:gwcs/wcs-1.2.0", From 30cf88d6004a909d592e0ed2a2e7fa74ddf92551 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 24 Jan 2024 14:03:43 -0500 Subject: [PATCH 15/29] Fixed Changelog. --- CHANGES.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 88f91379..e6794d02 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,11 +1,9 @@ A0.18.1 (unreleased) ------------------- -<<<<<<< HEAD - Added streamlined Level 3 Mosaic metadata schemas. [#334] -======= + - Remove the unused ``variance-1.0.0`` schema. [#344] ->>>>>>> 274a10bbc4c95d8835d926192f3da032c079883c - Add wcs tag to wfi_image and wfi_mosaic schemas. [#351] From 536ce7ab4f96a229050dbbbc5ee696e63e52115e Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 24 Jan 2024 14:04:20 -0500 Subject: [PATCH 16/29] Fixed Changelog. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index e6794d02..49ea5b22 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -A0.18.1 (unreleased) +0.18.1 (unreleased) ------------------- - Added streamlined Level 3 Mosaic metadata schemas. [#334] From d220119d86913304e5537cd7c5cf572758455f75 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Fri, 26 Jan 2024 07:18:00 -0500 Subject: [PATCH 17/29] Reverted pass_number to pass. --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 6 +++--- src/rad/resources/schemas/observation-1.0.0.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index f70091d9..bf69dda1 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -89,7 +89,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.segment] - pass_number: + pass: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer @@ -160,10 +160,10 @@ properties: datatype: nvarchar(25) destination: [ScienceCommon.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, model_type, visit, segment, pass_number, program, + mean_exposure_time, model_type, visit, segment, pass, program, survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, model_type, visit, segment, pass_number, program, + mean_exposure_time, model_type, visit, segment, pass, program, survey, optical_element, instrument, telescope, location_name, product_type ] ... diff --git a/src/rad/resources/schemas/observation-1.0.0.yaml b/src/rad/resources/schemas/observation-1.0.0.yaml index e83bb961..c30c4274 100644 --- a/src/rad/resources/schemas/observation-1.0.0.yaml +++ b/src/rad/resources/schemas/observation-1.0.0.yaml @@ -55,7 +55,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.execution_plan, GuideWindow.execution_plan] - pass_number: + pass: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer @@ -171,13 +171,13 @@ properties: datatype: nvarchar(15) destination: [ScienceCommon.survey, GuideWindow.survey] propertyOrder: [obs_id, visit_id, program, - execution_plan, pass_number, observation, segment, + execution_plan, pass, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey] flowStyle: block required: [obs_id, visit_id, program, - execution_plan, pass_number, observation, segment, + execution_plan, pass, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey] From 2064b4a59ff4134d6e93105a7ffa9ccfbc0e1305 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Fri, 26 Jan 2024 07:24:51 -0500 Subject: [PATCH 18/29] Remove individual_image_meta from required keyword list. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index e60a23b2..b57573dc 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -30,7 +30,7 @@ properties: anyOf: - tag: tag:stsci.edu:gwcs/wcs-* - type: "null" - required: [basic, individual_image_meta, program, resample, wcs] + required: [basic, program, resample, wcs] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 From baf98ab98be4e199b76b2d3902e7061b05ec94a5 Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Tue, 23 Jan 2024 14:08:01 -0500 Subject: [PATCH 19/29] add filename to wfi mosaic --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index b57573dc..e05f1a2c 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -15,6 +15,8 @@ properties: allOf: - type: object properties: + filename: + tag: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0 # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag basic: From 17abeabfb5200f685ddb98412242fcd29e5654bd Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Sat, 27 Jan 2024 23:11:50 -0500 Subject: [PATCH 20/29] put filename in the requested mosaic basic schema --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 5 ++++- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index bf69dda1..39109574 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -159,9 +159,12 @@ properties: archive_catalog: datatype: nvarchar(25) destination: [ScienceCommon.product_type] + filename: + tag: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0 propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, mean_exposure_time, model_type, visit, segment, pass, program, - survey, optical_element, instrument, telescope, location_name, product_type ] + survey, optical_element, instrument, telescope, location_name, product_type, + filename ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, mean_exposure_time, model_type, visit, segment, pass, program, diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index e05f1a2c..b57573dc 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -15,8 +15,6 @@ properties: allOf: - type: object properties: - filename: - tag: asdf://stsci.edu/datamodels/roman/tags/filename-1.0.0 # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag basic: From c764377caf60743ab0116a35141001ad7a3979d0 Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Sun, 28 Jan 2024 23:20:36 -0500 Subject: [PATCH 21/29] add mosaic_wcsinfo to the top level of wfi_mosaic --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index b57573dc..fba4157c 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -30,7 +30,9 @@ properties: anyOf: - tag: tag:stsci.edu:gwcs/wcs-* - type: "null" - required: [basic, program, resample, wcs] + wcsinfo: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 + required: [basic, program, resample, wcs, wcsinfo] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 From ddae14f2dc1111bd166bd312c1efbbf9ce706f13 Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Mon, 29 Jan 2024 09:52:11 -0500 Subject: [PATCH 22/29] make filename required Needed to remove regression errors in romancal --- src/rad/resources/schemas/mosaic_basic-1.0.0.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 39109574..efe6edfa 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -168,5 +168,6 @@ propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, mean_exposure_time, model_type, visit, segment, pass, program, - survey, optical_element, instrument, telescope, location_name, product_type ] + survey, optical_element, instrument, telescope, location_name, product_type, + filename ] ... From 0df01e6ec496e1c6191a0ada8d5482d181c7f8fe Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Mon, 29 Jan 2024 14:09:07 -0500 Subject: [PATCH 23/29] Add cal_step to mosaic model. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index fba4157c..1a70f6fb 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -19,6 +19,8 @@ properties: # Placeholder for 'dither' schema tag basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 + cal_step: + tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0 individual_image_meta: tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 program: @@ -32,7 +34,7 @@ properties: - type: "null" wcsinfo: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 - required: [basic, program, resample, wcs, wcsinfo] + required: [basic, cal_step, program, resample, wcs, wcsinfo] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 From e570bff7f7c6a7d0115208bb538e7eb55beabdb4 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Mon, 29 Jan 2024 14:58:20 -0500 Subject: [PATCH 24/29] Added association block to mosaic. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 1a70f6fb..6b3ce003 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -17,6 +17,8 @@ properties: properties: # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag + asn: + tag: asdf://stsci.edu/datamodels/roman/tags/associations-1.0.0 basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 cal_step: From 19e2d642a3e33c6e688530f49ec674df4cc8e709 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Mon, 29 Jan 2024 18:35:08 -0500 Subject: [PATCH 25/29] Commented association in mosaic. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 6b3ce003..e786ffeb 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -17,8 +17,8 @@ properties: properties: # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag - asn: - tag: asdf://stsci.edu/datamodels/roman/tags/associations-1.0.0 + # asn: + # tag: asdf://stsci.edu/datamodels/roman/tags/associations-1.0.0 basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 cal_step: From 4161d9c8bf1e483248dbaf7f3ba59dca5ed6841b Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Wed, 31 Jan 2024 10:24:13 -0500 Subject: [PATCH 26/29] create new mosaic associations meta block there seems to be issues with tag definitions which is currently not understood. --- .../resources/manifests/datamodels-1.0.yaml | 5 +++++ .../schemas/mosaic_associations-1.0.0.yaml | 18 ++++++++++++++++++ .../resources/schemas/wfi_mosaic-1.0.0.yaml | 5 ++--- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/rad/resources/schemas/mosaic_associations-1.0.0.yaml diff --git a/src/rad/resources/manifests/datamodels-1.0.yaml b/src/rad/resources/manifests/datamodels-1.0.yaml index 20bf9e8b..fd40518f 100644 --- a/src/rad/resources/manifests/datamodels-1.0.yaml +++ b/src/rad/resources/manifests/datamodels-1.0.yaml @@ -135,6 +135,11 @@ tags: title: Basic mosaic metadata keywords description: |- Basic mosaic metadata keywords +- tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_associations-1.0.0 + schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_associations-1.0.0 + title: Mosaic associations metadata keywords + description: |- + Mosaic associations metadata keywords - tag_uri: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 schema_uri: asdf://stsci.edu/datamodels/roman/schemas/mosaic_wcsinfo-1.0.0 title: Mosaic WCS parameters diff --git a/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml b/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml new file mode 100644 index 00000000..18f7dc0d --- /dev/null +++ b/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml @@ -0,0 +1,18 @@ +%YAML 1.1 +--- +$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 +id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_associations-1.0.0 + +title: Association information for mosaic + +type: object +properties: + pool_name: + type: string + table_name: + type: string + +required: [pool_name, table_name] +flowStyle: block +propertyOrder: [pool_name, table_name] +... diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index e786ffeb..cda7045a 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -15,10 +15,9 @@ properties: allOf: - type: object properties: - # Placeholder for 'asn' schema tag # Placeholder for 'dither' schema tag - # asn: - # tag: asdf://stsci.edu/datamodels/roman/tags/associations-1.0.0 + asn: + tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_associations-1.0.0 basic: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 cal_step: From c75fe9f20f0f128b4780dc4758f5fd57eaf23193 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 31 Jan 2024 13:05:01 -0500 Subject: [PATCH 27/29] Updated associations block. --- src/rad/resources/schemas/mosaic_associations-1.0.0.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml b/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml index 18f7dc0d..98b957f0 100644 --- a/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_associations-1.0.0.yaml @@ -4,15 +4,17 @@ $schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0 id: asdf://stsci.edu/datamodels/roman/schemas/mosaic_associations-1.0.0 title: Association information for mosaic - type: object + properties: pool_name: + title: Pool name type: string table_name: + title: Table name type: string -required: [pool_name, table_name] +propertyOrder: [ pool_name, table_name ] flowStyle: block -propertyOrder: [pool_name, table_name] +required: [ pool_name, table_name ] ... From 53dcadbf2293314cb01e751cf7a78360abf4e330 Mon Sep 17 00:00:00 2001 From: PaulHuwe Date: Wed, 31 Jan 2024 20:48:31 -0500 Subject: [PATCH 28/29] Added photometry. --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index cda7045a..3beaeb28 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -24,6 +24,8 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0 individual_image_meta: tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 + photometry: + tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 resample: @@ -35,7 +37,7 @@ properties: - type: "null" wcsinfo: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_wcsinfo-1.0.0 - required: [basic, cal_step, program, resample, wcs, wcsinfo] + required: [asn, basic, cal_step, photometry, program, resample, wcs, wcsinfo] data: title: Science data, excluding border reference pixels. tag: tag:stsci.edu:asdf/unit/quantity-1.1.0 From 150696971568c2d7575aaa67ab207402a7399562 Mon Sep 17 00:00:00 2001 From: Jonathan Eisenhamer Date: Wed, 31 Jan 2024 22:46:46 -0500 Subject: [PATCH 29/29] add coordinates and ref_file to mosaic meta --- src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml index 3beaeb28..ad4620d2 100644 --- a/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml +++ b/src/rad/resources/schemas/wfi_mosaic-1.0.0.yaml @@ -22,12 +22,16 @@ properties: tag: asdf://stsci.edu/datamodels/roman/tags/mosaic_basic-1.0.0 cal_step: tag: asdf://stsci.edu/datamodels/roman/tags/cal_step-1.0.0 + coordinates: + tag: asdf://stsci.edu/datamodels/roman/tags/coordinates-1.0.0 individual_image_meta: tag: asdf://stsci.edu/datamodels/roman/tags/individual_image_meta-1.0.0 photometry: tag: asdf://stsci.edu/datamodels/roman/tags/photometry-1.0.0 program: tag: asdf://stsci.edu/datamodels/roman/tags/program-1.0.0 + ref_file: + tag: asdf://stsci.edu/datamodels/roman/tags/ref_file-1.0.0 resample: tag: asdf://stsci.edu/datamodels/roman/tags/resample-1.0.0 wcs: