Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RAD-138: Level 3 Mosaic Update #334

Merged
merged 39 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a46d9ae
Save
PaulHuwe Oct 26, 2023
75414b0
Save
PaulHuwe Oct 26, 2023
bf2556d
Initial push.
PaulHuwe Oct 26, 2023
f393cc6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 26, 2023
03675ae
Updated units.
PaulHuwe Oct 26, 2023
33b5e60
Merge branch 'main' of https://github.com/spacetelescope/rad into RAD…
PaulHuwe Oct 26, 2023
b6fb3e6
Merge branch 'RAD-138_L3Metadata' of https://github.com/PaulHuwe/rad …
PaulHuwe Oct 26, 2023
8d33aca
Removed required object.
PaulHuwe Oct 26, 2023
8ed33c3
Updated mosaic wcsinfo keywords, added titles, fixed bugs.
PaulHuwe Oct 31, 2023
dab5993
Updated changelog.
PaulHuwe Oct 31, 2023
ba867c0
Merge branch 'main' of https://github.com/spacetelescope/rad into RAD…
PaulHuwe Oct 31, 2023
cb2b6f8
Adjusted units.
PaulHuwe Nov 2, 2023
19b59d0
Rebase
PaulHuwe Nov 6, 2023
618615f
Merge branch 'main' of https://github.com/spacetelescope/rad into RAD…
PaulHuwe Nov 7, 2023
034b6fe
Addressed PR comments.
PaulHuwe Nov 7, 2023
86fdd37
Rebased
PaulHuwe Jan 8, 2024
7e322d3
Changed pass to pass_number.
PaulHuwe Jan 8, 2024
7d44f0b
Updated pass name in required lists
PaulHuwe Jan 9, 2024
33892c3
Rebased
PaulHuwe Jan 22, 2024
b175e42
Added model_type
PaulHuwe Jan 23, 2024
1fee3b0
Add Table schema keywords.
PaulHuwe Jan 24, 2024
30cf88d
Fixed Changelog.
PaulHuwe Jan 24, 2024
536ce7a
Fixed Changelog.
PaulHuwe Jan 24, 2024
d220119
Reverted pass_number to pass.
PaulHuwe Jan 26, 2024
2064b4a
Remove individual_image_meta from required keyword list.
PaulHuwe Jan 26, 2024
baf98ab
add filename to wfi mosaic
stscieisenhamer Jan 23, 2024
17abeab
put filename in the requested mosaic basic schema
stscieisenhamer Jan 28, 2024
c764377
add mosaic_wcsinfo to the top level of wfi_mosaic
stscieisenhamer Jan 29, 2024
ddae14f
make filename required
stscieisenhamer Jan 29, 2024
debdbc1
Merge pull request #4 from stscieisenhamer/rcal-704-l3resample
PaulHuwe Jan 29, 2024
0df01e6
Add cal_step to mosaic model.
PaulHuwe Jan 29, 2024
e570bff
Added association block to mosaic.
PaulHuwe Jan 29, 2024
19e2d64
Commented association in mosaic.
PaulHuwe Jan 29, 2024
4161d9c
create new mosaic associations meta block
stscieisenhamer Jan 31, 2024
6ef1724
Merge pull request #5 from stscieisenhamer/rcal-704-l3resample
PaulHuwe Jan 31, 2024
c75fe9f
Updated associations block.
PaulHuwe Jan 31, 2024
53dcadb
Added photometry.
PaulHuwe Feb 1, 2024
1506969
add coordinates and ref_file to mosaic meta
stscieisenhamer Feb 1, 2024
a0f3c29
Merge pull request #6 from stscieisenhamer/rcal-704-l3resample
PaulHuwe Feb 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
0.18.1 (unreleased)
-------------------

- Added streamlined Level 3 Mosaic metadata schemas. [#334]

- Remove the unused ``variance-1.0.0`` schema. [#344]

- Add wcs tag to wfi_image and wfi_mosaic schemas. [#351]
Expand Down
22 changes: 21 additions & 1 deletion src/rad/resources/manifests/datamodels-1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -125,6 +125,26 @@ 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_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_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
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
Expand Down
83 changes: 83 additions & 0 deletions src/rad/resources/schemas/individual_image_meta-1.0.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
%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: Combined level 2 metadata

type: object
properties:
basic:
description: |
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: [basic, aperture, cal_step, coordinates, ephemeris,
exposure, guidestar, instrument, observation, photometry,
pointing, program, ref_file, target, velocity_aberration,
visit, wcsinfo]
...
20 changes: 20 additions & 0 deletions src/rad/resources/schemas/mosaic_associations-1.0.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%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:
title: Pool name
type: string
table_name:
title: Table name
type: string

propertyOrder: [ pool_name, table_name ]
flowStyle: block
required: [ pool_name, table_name ]
...
173 changes: 173 additions & 0 deletions src/rad/resources/schemas/mosaic_basic-1.0.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-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: Earliest component image start time in the mosaic in MJD
type: number
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
archive_catalog:
datatype: float
destination: [ScienceCommon.time_first_mjd]
time_last_mjd:
title: Latest component image end time in the mosaic in MJD
type: number
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
archive_catalog:
datatype: float
destination: [ScienceCommon.time_last_mjd]
time_mean_mjd:
title: Mean of mid-times of component images in MJD
type: number
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
archive_catalog:
datatype: float
destination: [ScienceCommon.time_mean_mjd]
max_exposure_time:
title: Maximum component image exposure time in MJD
type: number
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
archive_catalog:
datatype: float
destination: [ScienceCommon.max_exposure_time]
mean_exposure_time:
title: Mean of component image exposure times in MJD
type: number
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
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'.
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:
PaulHuwe marked this conversation as resolved.
Show resolved Hide resolved
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]
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
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: Name of the skycell containing the mosaic
type: string
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
archive_catalog:
datatype: nvarchar(25)
destination: [ScienceCommon.location_name]
product_type:
title: Association product type
type: string
sdf:
special_processing: VALUE_REQUIRED
source:
origin: TBD
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,
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,
survey, optical_element, instrument, telescope, location_name, product_type,
filename ]
...
Loading
Loading