Unverified Commit 6f07ec33 authored by Summer Stapleton's avatar Summer Stapleton Committed by GitHub
Browse files

Merge pull request #169 from kberryUSGS/modularize_losecf 

Initial steps to modularize UsgsAstroLsSensorModel::losToEcf
parents d3c3aefb a6988a91

include/usgscsm/UsgsAstroLsSensorModel.h

+38 −4
Original line number Diff line number Diff line
@@ -916,7 +916,41 @@ private: 
      double* achievedPrecision = NULL,

      csm::WarningList* warnings = NULL) const;



   // methods pulled out of los2ecf



   void computeDistortedFocalPlaneCoordinates(

       const double& line, 

       const double& sample, 

       double& distortedLine, 

       double& distortedSample) const;



   void computeUndistortedFocalPlaneCoordinates(

       const double& distortedFocalPlaneX, 

       const double& distortedFocalPlaneY, 

       double& undistortedFocalPlaneX, 

       double& undistortedFocalPlaneY) const; 



   void calculateRotationMatrixFromQuaternions(

       const double& time, 

       double cameraToBody[9]) const;



   void calculateRotationMatrixFromEuler(

       double euler[], 

       double rotationMatrix[]) const;



   void createCameraLookVector(

       const double& undistortedFocalPlaneX, 

       const double& undistortedFocalPlaneY,

       const std::vector<double>& adj,  

       double cameraLook[]) const; 



   void calculateAttitudeCorrection(

       const double& time, 

       const std::vector<double>& adj, 

       double attCorr[9]) const; 



// This method computes the imaging locus.

// imaging locus : set of ground points associated with an image pixel.

   void losToEcf(

      const double& line,       // CSM image convention

      const double& sample,     //    UL pixel center == (0.5, 0.5)
@@ -927,9 +961,9 @@ private: 
      double&       vx,         // output sensor x velocity

      double&       vy,         // output sensor y velocity

      double&       vz,         // output sensor z cvelocity

      double&       xl,         // output line-of-sight x coordinate

      double&       yl,         // output line-of-sight y coordinate

      double&       zl ) const;

      double&       bodyFixedX, // output line-of-sight x coordinate

      double&       bodyFixedY, // output line-of-sight y coordinate

      double&       bodyFixedZ ) const;



   // Computes the LOS correction due to light aberration

   void lightAberrationCorr(

src/UsgsAstroLsSensorModel.cpp

+181 −238

File changed.

Preview size limit exceeded, changes collapsed.