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

Re-add and refactor lrowacphomap #4961

Merged
merged 14 commits into from
May 25, 2022

Conversation

cordellmichaud
Copy link
Contributor

@cordellmichaud cordellmichaud commented May 19, 2022

Description

  • Re-added lrowacphomap app
  • Refactored lrowacphomap app to be callable for testing
  • Moved previously global variables into new callable lrowacphomap function
  • Converted lrowacphomap helper functions into lambdas with captures
  • Updated lrowacphomap xml file history section with changes
  • Added functional tests and associated test data for lrowacphomap to validate output

Related Issue

#4960

Motivation and Context

This change enables applying photometric correction to WAC cubes with a parameter cube defining Hapke model parameters for the correction, a PVL file defining the algorithm, and an optional backplane cube.

This change also brings lrowacphomap in line with the newer testing framework for ISIS and covers the re-addition and refactoring with functional tests.

How Has This Been Tested?

Functional tests were added to isis/tests/FunctionalTestsLrowacphomap.cpp to cover the re-addition by validating its output.

The app was also tested and validated by the science team at LROC.

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@cordellmichaud cordellmichaud marked this pull request as ready for review May 19, 2022 23:19
@scsides
Copy link
Contributor

scsides commented May 20, 2022

Working on the review. I'll start a CI test for this as well.

@scsides
Copy link
Contributor

scsides commented May 20, 2022

While I'm finishing the review, you might want to check out the test failure: https://astroservices.usgs.gov/jenkins/job/USGS-Astrogeology/job/ISIS3/view/change-requests/job/PR-4961/2/execution/node/31/log/?consoleFull

Scroll to the bottom to see the error, then search for the error number, or just search for the program or test name

@cordellmichaud
Copy link
Contributor Author

These new commits should solve the Lrowacphomap.FunctionalTestLrowacphomapNoBack failure.

@jessemapel
Copy link
Contributor

The failure for 2030 - TestKernelDb.TestKernelsSmithOffset (Failed) is not from this PR so disregard for now

Copy link
Contributor

@scsides scsides left a comment

Choose a reason for hiding this comment

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

This looks good. I've started another CI build for this PR. If the tests pass then it is good to merge.

@scsides
Copy link
Contributor

scsides commented May 25, 2022

CI ran without errors caused by this. Merged

@scsides scsides merged commit cae8ec2 into DOI-USGS:dev May 25, 2022
Kelvinrr pushed a commit to gsn9/ISIS3 that referenced this pull request Jul 18, 2022
* Add radiance units label in lrowaccal output cube

* Revert "Add radiance units label in lrowaccal output cube"

* Add refactored lrowacphomap app

* Add lrowacphomap functional tests and test data

* Add entry to CHANGELOG.md for the re-addition and refactoring of lrowacphomap

* Change ShapeModel keyword in Kernels group of lrowacphomap test cube label to relative path

* Add new test cube corresponding to the lrowacphomap test input cube's updated ShapeModel value

* Update expected stats result values for the LrowacphomapNoBack functional test

Co-authored-by: Victor Silva <victor.silva@asu.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants