Commit 3574cf14 authored by jay's avatar jay
Browse files

Operator flip for image direction and minor cleanup

parent 32f15570

src/UsgsAstroLsPlugin.cpp

+2 −1
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ bool UsgsAstroLsPlugin::canModelBeConstructedFromISD( 
   for(auto &key : mISD_KEYWORDS){

       value = image_support_data.param(key);

       if (value.empty()){

           std::cout<<key<<"\n"<<std::endl;

           constructible = false;

       }

   }
@@ -392,7 +393,7 @@ std::string UsgsAstroLsPlugin::convertISDToModelState( 
   if (!canModelBeConstructedFromISD(image_support_data, model_name)){

       throw csm::Error(csm::Error::ISD_NOT_SUPPORTED,

                        "Sensor model support data provided is not supported by this plugin",

                        "MdisPlugin::constructModelFromISD");

                        "GenericLsPlugin::constructModelFromISD");

   }



   // Instantiate UsgsAstroLineScanner sensor model

src/UsgsAstroLsSensorModel.cpp

+4 −5
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ void UsgsAstroLsSensorModel::updateState() 
   zo /= omag;

   double triple_product = xn*xo + yn*yo + zn*zo;

   _data.m_ImageFlipFlag = 0;

   if (triple_product < 0.0)

   if (triple_product > 0.0)

      _data.m_ImageFlipFlag = 1;

}
@@ -880,7 +880,6 @@ double UsgsAstroLsSensorModel::getImageTime( 
   double lineUSGSFull = lineCSMFull + 0.5;



   // USGS timing reference leftmost-side 1st full row



   double timeUsgs = _data.m_IntTime * (lineUSGSFull - 0.5)

      + _data.m_StartingEphemerisTime;

usgscam/genericls.pxd

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ cdef extern from "UsgsAstroLsSensorModel.h": 
        CppImageVector getImageSize()



        string getModelState()

        CppEcefVector getIlluminationDirection(CppEcefCoord &groundPoint)

        CppEcefVector getIlluminationDirection(CppEcefCoord &groundPoint) except +

        CppEcefCoord getSensorPosition(CppImageCoord &imagePt)

        CppEcefVector getSensorVelocity(CppImageCoord &imagePt)

        CppEcefLocus imageToProximateImagingLocus(CppImageCoord &imagePt,