diff --git a/src/UsgsAstroFrameSensorModel.cpp b/src/UsgsAstroFrameSensorModel.cpp index 13b5e4ccecb222a1570e810fa7a1339f2407efbe..469e8256e9f5b71a15ba25264bf7f30766cf8365 100644 --- a/src/UsgsAstroFrameSensorModel.cpp +++ b/src/UsgsAstroFrameSensorModel.cpp @@ -525,7 +525,7 @@ UsgsAstroFrameSensorModel::computeAllSensorPartials( groundPt.x, groundPt.y, groundPt.z, imagePt.line, imagePt.samp, pset, desiredPrecision); - return RasterGM::computeAllSensorPartials(imagePt, groundPt, pset, desiredPrecision, + return RasterGM::computeAllSensorPartials(imagePt, groundPt, pset, desiredPrecision, achievedPrecision, warnings); } @@ -1125,12 +1125,9 @@ csm::SharingCriteria UsgsAstroFrameSensorModel::getParameterSharingCriteria( int index) const { MESSAGE_LOG( "Checking sharing criteria for parameter {}. " - "Sharing is not supported, throwing exception", + "Sharing is not supported.", index); - // Parameter sharing is not supported for this sensor, - // all indices are out of range - throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE, "Index out of range.", - "UsgsAstroLsSensorModel::getParameterSharingCriteria"); + return csm::SharingCriteria(); } double UsgsAstroFrameSensorModel::getParameterValue(int index) const { diff --git a/src/UsgsAstroLsSensorModel.cpp b/src/UsgsAstroLsSensorModel.cpp index a4cf4b6335a5f20ea75d033395c2643249f98138..688d19dd4ed1253d67a2dc999f55cef787e0f009 100644 --- a/src/UsgsAstroLsSensorModel.cpp +++ b/src/UsgsAstroLsSensorModel.cpp @@ -1568,12 +1568,9 @@ csm::SharingCriteria UsgsAstroLsSensorModel::getParameterSharingCriteria( int index) const { MESSAGE_LOG( "Checking sharing criteria for parameter {}. " - "Sharing is not supported, throwing exception", + "Sharing is not supported.", index); - // Parameter sharing is not supported for this sensor, - // all indices are out of range - throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE, "Index out of range.", - "UsgsAstroLsSensorModel::getParameterSharingCriteria"); + return csm::SharingCriteria(); } //*************************************************************************** diff --git a/tests/FrameCameraTests.cpp b/tests/FrameCameraTests.cpp index daf7324aaeb665b4f9f124e2fae8c2c9e06e6e5f..f367585d178447939abef976b067b13c59474873 100644 --- a/tests/FrameCameraTests.cpp +++ b/tests/FrameCameraTests.cpp @@ -624,11 +624,7 @@ TEST_F(FrameSensorModelLogging, IsParameterShareable) { } TEST_F(FrameSensorModelLogging, GetParameterSharingCriteria) { - try { - sensorModel->getParameterSharingCriteria(0); - } catch (...) { - // Just testing logging, so do nothing, it should still log - } + sensorModel->getParameterSharingCriteria(0); } TEST_F(FrameSensorModelLogging, GetParameterValue) {