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

updated ORex data area in IsisPref #4221

Merged
merged 12 commits into from
Mar 11, 2021
Merged

updated ORex data area in IsisPref #4221

merged 12 commits into from
Mar 11, 2021

Conversation

Kelvinrr
Copy link
Collaborator

Description

Kernels for ORex were updated so the default config has been changed to reflect that.

Related Issue

#4060

Motivation and Context

How Has This Been Tested?

Have not tested locally, just gonna let Jenkins do it's thing.

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.

jessemapel
jessemapel previously approved these changes Dec 24, 2020
@@ -48,6 +48,7 @@ update the Unreleased link so that it compares against the latest release tag.
- The isis3VarInit script is now just called isisVarInit and allows for more robust paths. [#3945](https://github.com/USGS-Astrogeology/ISIS3/pull/3945)
- Isis2raw will now output straight to a 32bit file (no stretch) when stretch is set to None and bittype is set to 32bit. [#3878](https://github.com/USGS-Astrogeology/ISIS3/issues/3878)
- Findimageoverlaps can now have calculations and writes happen at the same time or sequentially. [#4047](https://github.com/USGS-Astrogeology/ISIS3/pull/4047)
- IsisPreferences has had the default path to Osirisrex updated to point to new kernels released by NAIF [#4060](https://github.com/USGS-Astrogeology/ISIS3/issues/4060)
Copy link
Contributor

Choose a reason for hiding this comment

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

This would be a good opportunity to add that we have support for the OREx Bennu data.

Copy link
Contributor

Choose a reason for hiding this comment

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

The TestPreference file needs to have the same change. Changing this may cause some tests to fail.

scsides
scsides previously approved these changes Dec 29, 2020
@robotprogrammer22
Copy link
Contributor

It looks like a couple of tests for osirisrex are failing on jenkins at the moment. I'm not sure if it's related to the change in path. I'll take a look and see if I can figure it out.

@acpaquette
Copy link
Collaborator

@Kelvinrr the Orex Camera unit test is still failing on this one

@jessemapel
Copy link
Contributor

What's the status on this? Do you need a new test image that is actually of Bennu for the OCams unit test?

@KrisBecker
Copy link
Contributor

I would highly recommend you add at least one image each for the PolyCam and SamCam instruments. Note PolyCam has over 94 separate focus position settings each with distinctly different focal lengths, distortion parameters and center positions.

I would also recommend you add tests using the shape model (bennu_g_00880mm_alt_obj_0000n00000_v020.bds) provided with the kernel set to determine how it interacts with the ISIS system.

Please let me know which images you select and I can provide corresponding caminfo data for comparisons.

When do you anticipate releasing these kernels?

Thanks...

@jlaura
Copy link
Collaborator

jlaura commented Feb 9, 2021

@KrisBecker Those updates sound like they might be a new PR. Will have to have @Kelvinrr weigh in. If so, PRs from external contributors are always solicited! Especially so when they have expertise in the instrument.

@Kelvinrr Pining you again in case you missed the bump from @jessemapel.

@KrisBecker
Copy link
Contributor

Possibly could lead to a PR but would be good to know if its needed. A few tests should inform us.

@Kelvinrr
Copy link
Collaborator Author

Kelvinrr commented Feb 9, 2021

@jessemapel This has been hanging for some time because I haven't really been putting those support hours in. It basically needs some test images that are within the time ranges for the public kernels, as the original images were from the privated kernels.

I agree that @KrisBecker's updates are out of scope for this PR.

@jessemapel
Copy link
Contributor

jessemapel commented Feb 9, 2021

I agree that adding more test coverage is outside of the scope of this, all that should be done here is updating the existing PolyCam and MapCam tests. I'll open up a new issue regarding improving the camera model test coverage that and it can be prioritized with the next mission support sprint.

@jessemapel
Copy link
Contributor

@KrisBecker What is special about that DSK that is different from the existing DSK tests? I am hesitant to add a 100 MB file to the test data requirements unless it is absolutely necessary.

@KrisBecker
Copy link
Contributor

KrisBecker commented Feb 9, 2021

@jessemapel the new Bennu DSK is not different, per se, than other DSKs in the ISIS system. It is, however, pretty much required for good cartographic processing. Bennu has some rather large boulders, meters high, that are well modeled in the DSK.

I was just asking that it be included in a test to confirm ISIS4 can interoperate with the DSK to support mapping operations.

@jessemapel
Copy link
Contributor

Okay, I agree then. Orthorectifying onto the DSK with the test image by hand and seeing if it intersects reasonably make sense to me. I can do that check after Kelvin finishes with this.

@Kelvinrr
Copy link
Collaborator Author

I think this one is good to go, after merging I can update the truth data for mapcam.

Copy link
Contributor

@jessemapel jessemapel 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, just need to delete the old unitTest.cpp for the OCams. The Truth file is deleted but not the unittest and it's causing a test failure.

@jessemapel jessemapel merged commit 764c45b into DOI-USGS:dev Mar 11, 2021
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.

7 participants