Commit 498d9773 authored by Jesse Mapel's avatar Jesse Mapel Committed by Jesse Mapel
Browse files

Added no sharing criteria

parent 763fe44e

src/UsgsAstroFrameSensorModel.cpp

+3 −6
Original line number Diff line number Diff line
@@ -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 {

src/UsgsAstroLsSensorModel.cpp

+2 −5
Original line number Diff line number Diff line
@@ -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();

}



//***************************************************************************

tests/FrameCameraTests.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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

  }

}



TEST_F(FrameSensorModelLogging, GetParameterValue) {