Commit f0c290ff authored by Jesse Mapel's avatar Jesse Mapel Committed by Jesse Mapel
Browse files

General clean-up

parent bfa70e0e

isis/src/base/apps/csminit/csminit.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    <p>

      Information about the CSM model will also be added to the CsmInfo group on

      the cube label. The group includes names, units, and types for model

      parameter. These are just for users to reference and are not used

      programmatically.

      parameters.

    </p>

    <pre>

Group = CsmInfo

isis/src/base/objs/CSMCamera/CSMCamera.h

+1 −1
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ namespace Isis { 
      QString getParameterName(int index);

      QString getParameterUnits(int index);

      double getParameterValue(int index);

      std::vector<double> getSensorPartials(int index, SurfacePoint groundPoint);



      std::vector<double> getSensorPartials(int index, SurfacePoint groundPoint);

      virtual std::vector<double> GroundPartials(SurfacePoint groundPoint);

      virtual std::vector<double> GroundPartials();

isis/src/control/apps/jigsaw/jigsaw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ namespace Isis { 
            QString jigComment = "Jigged = " + Isis::iTime::CurrentLocalTime();

            if (c->hasBlob("CSMState", "String")) {

              Blob csmStateBlob("CSMState", "String");

              // Read the BLOB from the cube to prepropagate things like the model

              // Read the BLOB from the cube to propagate things like the model

              // and plugin name

              c->read(csmStateBlob);

              std::string modelState = bundleAdjustment->modelState(i).toStdString();

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+8 −4
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ namespace Isis { 
          throw IException(IException::Programmer, msg, _FILEINFO_);

        }



        // TODO ISIS vs. CSM (addNewIsisObservation?)

        BundleObservationQsp observation =

            m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings);
@@ -2820,7 +2819,10 @@ namespace Isis { 




  /**

   * Return a table cmatrix for the ith cube in the cube list given to the constructor.

   * Return the updated instrument pointing table for the ith cube in the cube

   * list given to the constructor.

   *

   * This is only valid for ISIS camera model cubes

   *

   * @param i The index of the cube

   *
@@ -2832,8 +2834,10 @@ namespace Isis { 




  /**

   * Return a table spacecraft vector for the ith cube in the cube list given to the

   * constructor.

   * Return the updated instrument position table for the ith cube in the cube

   * list given to the constructor.

   *

   * This is only valid for ISIS camera model cubes

   *

   * @param i The index of the cube

   *

isis/src/control/objs/BundleAdjust/unitTest.cpp

+0 −40
Original line number Diff line number Diff line
@@ -24,43 +24,3 @@ int main(int argc, char *argv[]) { 
    e.print();

  }

}
 


#if 0

Code not currently covered by jigsaw app tests



These methods are never called

 static void cholmodErrorHandler();

 BundleAdjust(BundleSettings bundleSettings, QString &cnet, SerialNumberList &snlist, bool bPrintSummary);

 BundleAdjust(BundleSettings bundleSettings, Control &cnet, SerialNumberList &snlist, bool bPrintSummary);

 BundleAdjust(BundleSettings bundleSettings, ControlNet &cnet, SerialNumberList &snlist, bool bPrintSummary);

 BundleAdjust(BundleSettings bundleSettings, Control &cnet, QList<ImageList *> &imgLists, bool bPrintSummary);

 ~BundleAdjust();

 bool BundleAdjust::freeCHOLMODLibraryVariables();





These have partial coverage

 void BundleAdjust::init(Progress *progress) {

    (pCamera==false) for Camera *pCamera = m_controlNet->Camera(0);

    (m_bodyRadii[0] < 0 && pCamera==true)

    (image==false) for BundleImage* image = new BundleImage(camera, serialNumber, fileName);

    (m_bundleSettings.validateNetwork()==false) -- this is never the case for jigsaw, need to test elsewhere





Errors:

 void BundleAdjust::init(Progress *progress) {

    (image==false) for BundleImage* image = new BundleImage(camera, serialNumber, fileName);

          QString msg = "In BundleAdjust::init(): image " + fileName + "is null" + "\n";

    (observation==false) for IsisBundleObservation *observation = m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings);

          QString msg = "In BundleAdjust::init(): observation " + observationNumber + "is null" + "\n";





 bool BundleAdjust::validateNetwork() {

    ( numMeasures <= 1 ) for int numMeasures = m_controlNet->GetNumberOfValidMeasuresInImage(m_serialNumberList->SerialNumber(i));

    ( nimagesWithInsufficientMeasures > 0 )

          QString msg = "Images with one or less measures:\n";



 void BundleAdjust::checkHeldList() {

    (m_serialNumberList->HasSerialNumber(m_heldImageSerialNumberList->SerialNumber(ih))==false)

          QString msg = "Held image not in FROMLIST";



#endif