Commit bafed61e authored by Jesse Mapel's avatar Jesse Mapel Committed by Makayla Shepherd
Browse files

Added check for sample and line residual back to controlPointv1

parent 8f1a6f74

isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp

+16 −0
Original line number Diff line number Diff line
@@ -426,6 +426,9 @@ namespace Isis { 
        measure.mutable_measurement()->set_line(value);

        group.deleteKeyword("Line");

      }



      // Some old networks use ErrorSample and ErrorLine,

      // others use SampleResidual and LineResidual so check for both

      if (group.hasKeyword("ErrorSample")) {

        double value = toDouble(group["ErrorSample"][0]);

        measure.mutable_measurement()->set_sampleresidual(value);
@@ -437,6 +440,19 @@ namespace Isis { 
        group.deleteKeyword("ErrorLine");

      }



      if (group.hasKeyword("SampleResidual")) {

        double value = toDouble(group["SampleResidual"][0]);

        measure.mutable_measurement()->set_sampleresidual(value);

        group.deleteKeyword("SampleResidual");

      }

      measure.mutable_measurement()->set_sampleresidual(sampleResidualValue);



      if (group.hasKeyword("LineResidual")) {

        double value = toDouble(group["LineResidual"][0]);

        measure.mutable_measurement()->set_lineresidual(value);

        group.deleteKeyword("LineResidual");

      }



      if (group.hasKeyword("Reference")) {

        if (group["Reference"][0].toLower() == "true") {

          m_pointData->set_referenceindex(groupIndex);