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.

Sign up for GitHub

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

Writing 0 Value Residuals to PVL #3194

Merged
merged 3 commits into from
Mar 29, 2019
Merged

Writing 0 Value Residuals to PVL #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d415371
Allowed writting of residuals when value is zero to controlnet pvl
acpaquette Mar 28, 2019
d90e56a
Merge branch 'dev' of https://github.com/USGS-Astrogeology/ISIS3 into…
acpaquette Mar 28, 2019
3a6975f
Updated ControlNetVersioner unit test
acpaquette Mar 28, 2019
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
8 changes: 3 additions & 5 deletions isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,15 +501,13 @@ namespace Isis {
"pixels");
}

if ( controlMeasure.GetSampleResidual() != Isis::Null
&& controlMeasure.GetSampleResidual() != 0. ) {
if ( controlMeasure.GetSampleResidual() != Isis::Null ) {
pvlMeasure += PvlKeyword("SampleResidual",
toString(controlMeasure.GetSampleResidual()),
"pixels");
}

if ( controlMeasure.GetLineResidual() != Isis::Null
&& controlMeasure.GetLineResidual() != 0. ) {
if ( controlMeasure.GetLineResidual() != Isis::Null ) {
pvlMeasure += PvlKeyword("LineResidual", toString(controlMeasure.GetLineResidual()),
"pixels");
}
Expand Down Expand Up @@ -1675,7 +1673,7 @@ namespace Isis {
pointByteTotal += writeFirstPoint(&output);
}

// // Insert header at the beginning of the file once writing is done.
// Insert header at the beginning of the file once writing is done.
ControlNetFileHeaderV0005 protobufHeader;

protobufHeader.set_networkid(m_header.networkID.toLatin1().data());
Expand Down
72 changes: 41 additions & 31 deletions isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.truth
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,25 @@ Object = ControlNetwork
End_Group

Group = ControlMeasure
SerialNumber = M1
MeasureType = Candidate
ChooserName = Unknown
DateTime = 2018-01-09
Sample = 1.0
Line = 1.0
SerialNumber = M1
MeasureType = Candidate
ChooserName = Unknown
DateTime = 2018-01-09
Sample = 1.0
Line = 1.0
SampleResidual = 0.0 <pixels>
LineResidual = 0.0 <pixels>
End_Group

Group = ControlMeasure
SerialNumber = M2
MeasureType = Candidate
ChooserName = Unknown
DateTime = 2018-01-09
Sample = 1.0
Line = 1.0
SerialNumber = M2
MeasureType = Candidate
ChooserName = Unknown
DateTime = 2018-01-09
Sample = 1.0
Line = 1.0
SampleResidual = 0.0 <pixels>
LineResidual = 0.0 <pixels>
End_Group
End_Object
End_Object
Expand Down Expand Up @@ -80,31 +84,37 @@ Object = ControlNetwork
DateTime = 2018-01-19

Group = ControlMeasure
SerialNumber = Cassini-Huygens/ISSNA/1/1467436709.122
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 893.0
Line = 616.0
SerialNumber = Cassini-Huygens/ISSNA/1/1467436709.122
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 893.0
Line = 616.0
SampleResidual = 0.0 <pixels>
LineResidual = 0.0 <pixels>
End_Group

Group = ControlMeasure
SerialNumber = Cassini-Huygens/ISSNA/1/1467443189.122
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 799.25
Line = 701.21
Reference = True
SerialNumber = Cassini-Huygens/ISSNA/1/1467443189.122
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 799.25
Line = 701.21
SampleResidual = 0.0 <pixels>
LineResidual = 0.0 <pixels>
Reference = True
End_Group

Group = ControlMeasure
SerialNumber = Cassini-Huygens/ISSNA/1/1467454012.125
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 569.01
Line = 807.23
SerialNumber = Cassini-Huygens/ISSNA/1/1467454012.125
MeasureType = RegisteredPixel
ChooserName = Unknown
DateTime = 2018-01-19
Sample = 569.01
Line = 807.23
SampleResidual = 0.0 <pixels>
LineResidual = 0.0 <pixels>
End_Group
End_Object
End_Object
Expand Down