Unverified Commit a38a81ef authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #130 from kberryUSGS/frame_cleanup 

Clean up some spacing (non-functional) in UsgsAstroFrameModel
parents f6a2e95f cc4b0215

src/UsgsAstroFrameSensorModel.cpp

+73 −82
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ UsgsAstroFrameSensorModel::UsgsAstroFrameSensorModel() { 
    reset();

}





void UsgsAstroFrameSensorModel::reset() {

    m_modelName = _SENSOR_MODEL_NAME;

    m_majorAxis = 0.0;
@@ -452,8 +451,7 @@ std::vector<csm::RasterGM::SensorPartials> UsgsAstroFrameSensorModel::computeAll 
    csm::param::Set pset,

    double desiredPrecision,

    double *achievedPrecision,

    csm::WarningList *warnings) const

    {

    csm::WarningList *warnings) const {

  std::vector<int> indices = getParameterSetIndices(pset);

  size_t num = indices.size();

  std::vector<csm::RasterGM::SensorPartials> partials;
@@ -471,16 +469,15 @@ std::vector<csm::RasterGM::SensorPartials> UsgsAstroFrameSensorModel::computeAll 
    csm::param::Set pset,

    double desiredPrecision,

    double *achievedPrecision,

    csm::WarningList *warnings) const

    {

    csm::WarningList *warnings) const {

  csm::ImageCoord imagePt = groundToImage(groundPt,

                                          desiredPrecision, achievedPrecision, warnings);

  return computeAllSensorPartials(imagePt, groundPt,

                                  pset, desiredPrecision, achievedPrecision, warnings);

    }



std::vector<double> UsgsAstroFrameSensorModel::computeGroundPartials(const csm::EcefCoord &groundPt) const {



std::vector<double> UsgsAstroFrameSensorModel::computeGroundPartials(const csm::EcefCoord 

                                                                     &groundPt) const {

  // Partials of line, sample wrt X, Y, Z

  // Uses collinearity equations

  std::vector<double> partials(6, 0.0);
@@ -995,13 +992,11 @@ void UsgsAstroFrameSensorModel::setReferencePoint(const csm::EcefCoord &groundPt 




int UsgsAstroFrameSensorModel::getNumParameters() const {



  return NUM_PARAMETERS;

}





std::string UsgsAstroFrameSensorModel::getParameterName(int index) const {



  return m_parameterName[index];

}
@@ -1288,9 +1283,7 @@ bool UsgsAstroFrameSensorModel::setFocalPlane(double dx,double dy, 
    undistortedY = dy;

    return false;

  }



  return true;



}
@@ -1343,8 +1336,6 @@ void UsgsAstroFrameSensorModel::distortionJacobian(double x, double y, double &J 
    Jyx = Jyx + d_dx[i] * m_odtY[i];

    Jyy = Jyy + d_dy[i] * m_odtY[i];

  }





}