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

ciss2isis - Set validmax global to input label value #4589

Merged
merged 4 commits into from
Feb 7, 2022

Conversation

tgiroux
Copy link
Contributor

@tgiroux tgiroux commented Aug 9, 2021

Description

Set the value for validMax along with the other globals by reading from the input label. Previously was set according to faulty logic, leading some images to be ingested with an incorrect valid maximum DN. The helper function FixDns() replaces all DN's == validMax with Hrs. This was spoiling pixels when validMax was set incorrectly.

Related Issue

#672

Motivation and Context

Isis Support

How Has This Been Tested?

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
Copy link
Contributor

How bad does the test conversion look on this? We should have a simple test for this case.

@tgiroux
Copy link
Contributor Author

tgiroux commented Aug 10, 2021

How bad does the test conversion look on this? We should have a simple test for this case.

Simple to convert, difficult to crop data. There's no existing script for cropping cassis edr and it's nontrivial for me to write one during this sprint.

Also - a test for this may not be valuable. This bug was the result of some faulty logic that has been removed, the same faulty logic would have to be rewritten for this to become an issue again in the future.

@tgiroux tgiroux requested a review from AustinSanders August 16, 2021 15:17
AustinSanders
AustinSanders previously approved these changes Aug 17, 2021
@acpaquette
Copy link
Collaborator

@jessemapel are we still waiting on a test here or can this be merged?


// initialize global variables
dataConversionType = (QString) inst.findKeyword("DataConversionType");
validMax = inputLabel.findKeyword("ValidMaximum")[1].toInt();
Copy link
Collaborator

Choose a reason for hiding this comment

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

Updated line, see the first commit on this PR

EXPECT_NEAR(hist->StandardDeviation(), 0.84419124016427105, .0001);
}

TEST(Ciss2Isis, Ciss2isisCustomMax) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Conversion to gtest necessary to accommodate this test

@acpaquette acpaquette requested a review from jessemapel February 3, 2022 18:07
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.

Conversion and new tests look good, just one small change to more directly check what the test is actually doing.

isis/tests/FunctionalTestsCiss2isis.cpp Outdated Show resolved Hide resolved
jessemapel
jessemapel previously approved these changes Feb 3, 2022
scsides
scsides previously approved these changes Feb 3, 2022
@acpaquette acpaquette dismissed stale reviews from scsides and jessemapel via 19eb7e4 February 4, 2022 16:04
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.

5 participants