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-143, RAD-144: Add FPS and TVAC schemas #364

Merged
merged 18 commits into from
Feb 28, 2024

Conversation

WilliamJamieson
Copy link
Collaborator

@WilliamJamieson WilliamJamieson commented Jan 29, 2024

Resolves RAD-143
Resolves RAD-144

Closes #355 and closes #356

This PR adds the FPS and TVAC data schemas to rad.

Checklist

Copy link

codecov bot commented Jan 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.38%. Comparing base (0fb1239) to head (37e5c7a).
Report is 5 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #364   +/-   ##
=======================================
  Coverage   95.38%   95.38%           
=======================================
  Files           4        4           
  Lines         195      195           
=======================================
  Hits          186      186           
  Misses          9        9           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@WilliamJamieson
Copy link
Collaborator Author

Someone needs to go through all the datatype keywords and let me know what dtypes I need to annotate them with.

Copy link
Collaborator

@PaulHuwe PaulHuwe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone more knowledgeable with TVAC & FPS data will need to review this. Of course, DB folks will need to approve their targets.

src/rad/resources/schemas/ground_exposure-1.0.0.yaml Outdated Show resolved Hide resolved
src/rad/resources/schemas/ground_exposure-1.0.0.yaml Outdated Show resolved Hide resolved
src/rad/resources/schemas/ground_exposure-1.0.0.yaml Outdated Show resolved Hide resolved
@schlafly
Copy link
Collaborator

Someone more knowledgeable with TVAC & FPS data will need to review this. Of course, DB folks will need to approve their targets.

Re group <-> resultant changes, I have mixed feelings. We do want to move from the "group" language to the "resultant" language, but we also want TVAC / FPS to be consistent with the main schemas, and more generally things like groupgap, ngroups we just want to delete as redundant and inflexible as compared with read_pattern. Eventually we need to revisit the L2 metadata to achieve that, but we have not yet.

So while we could change the language here I don't think we need to.

@PaulHuwe
Copy link
Collaborator

Re group <-> resultant changes, I have mixed feelings. We do want to move from the "group" language to the "resultant" language, but we also want TVAC / FPS to be consistent with the main schemas, and more generally things like groupgap, ngroups we just want to delete as redundant and inflexible as compared with read_pattern. Eventually we need to revisit the L2 metadata to achieve that, but we have not yet.

These are being changed in the main schemas as well, in PR #361

tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["A"]
archive_catalog:
datatype: float
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, if you look at it, its a scalar quantity, see line 67. The enum: ["A"] is specifying the unit on the quantity. It is my understanding that archive just stores the numerical value for these.

tag: tag:stsci.edu:asdf/unit/unit-1.*
enum: ["A"]
archive_catalog:
datatype: float
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment

@@ -12,105 +12,105 @@ properties:
enum: ['N/A', 'COMPLETE', 'SKIPPED', 'INCOMPLETE']
archive_catalog:
datatype: nvarchar(15)
destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs]
destination: [ScienceRefData.s_assign_wcs, GuideWindow.s_assign_wcs, WFICommon.s_assign_wcs]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kdupriestsci Not related to this PR, only for my understanding - do we need GuideWindow table updates for the cal_step entries if we are not processing Guide windows?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not the correct person to ask. Maybe @tddesjardins can weigh in?

%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/ground_exposure-1.0.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tddesjardins @fjaviersanchez William's suggestion seems reasonable to me. Any objections?

%YAML 1.1
---
$schema: asdf://stsci.edu/datamodels/roman/schemas/rad_schema-1.0.0
id: asdf://stsci.edu/datamodels/roman/schemas/ground_guidestar-1.0.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tddesjardins @fjaviersanchez William's suggestion seems reasonable to me. Any objections?

@PaulHuwe PaulHuwe self-assigned this Feb 27, 2024
Copy link

@fjaviersanchez fjaviersanchez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to us!

archive_catalog:
datatype: float
destination: [WFITvac.wfi_sce_1_vbiasgate_v]
wfi_sce_1_vbiaspwr_i:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing title?

archive_catalog:
datatype: float
destination: [WFITvac.wfi_sce_1_vbiaspwr_i]
wfi_sce_1_vbiaspwr_v:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing title?

archive_catalog:
datatype: float
destination: [WFITvac.wfi_sce_1_vbiaspwr_v]
wfi_sce_1_vreset_v:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing title?

archive_catalog:
datatype: float
destination: [WFITvac.wfi_sce_1_vreset_v]
wfi_sce_1_vreset_i:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing title?

@PaulHuwe PaulHuwe merged commit 0c8f514 into spacetelescope:main Feb 28, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FPS Schema TVAC Schema
8 participants