Unverified Commit 4fd24bfe authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Fixed jigsaw observation mode (#4791) 

* Test modification

* Added changelog
parent 364201b0

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ Keywords when running CAMSTATS. [#3605](https://github.com/USGS-Astrogeology/IS 
- Fixed Maptrim failures when mode=both for PositiveWest longitude direction. [#4646](https://github.com/USGS-Astrogeology/ISIS3/issues/4646)

- Fixed the Vesta target name not being translated properly in dawnfc2isis. [#4638](https://github.com/USGS-Astrogeology/ISIS3/issues/4638)

- Fixed a bug where the measure residuals reported in the bundleout.txt file were incorrect. [#4655](https://github.com/USGS-Astrogeology/ISIS3/issues/4655)

- Fuxed a bug where jigsaw would raise an error when solving for framing camera pointing in observation mode. [#4686](https://github.com/USGS-Astrogeology/ISIS3/issues/4686)



## [6.0.0] - 2021-08-27

isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp

+11 −10
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ namespace Isis { 
      addToExisting = true;

    }



    bool isIsisObservation = bundleImage->camera()->GetCameraType() != Camera::Csm;



    if (addToExisting) {

      // if we have already added a BundleObservation with this number, we have to add the new

      // BundleImage to this observation
@@ -126,8 +128,6 @@ namespace Isis { 
    else {

      // create new BundleObservation and append to this vector



      bool isIsisObservation = bundleImage->camera()->GetCameraType() != Camera::Csm;



      if (isIsisObservation) {

        bundleObservation.reset(new IsisBundleObservation(bundleImage,

                                                      observationNumber,
@@ -167,14 +167,6 @@ namespace Isis { 


      append(bundleObservation);



      if (isIsisObservation) {

        QSharedPointer<IsisBundleObservation> isisObs = qSharedPointerDynamicCast<IsisBundleObservation>(bundleObservation);

        isisObs->initializeExteriorOrientation();

        if (bundleSettings->solveTargetBody()) {

          isisObs->initializeBodyRotation();

        }

      }



      // update observation number to observation ptr map

      m_observationNumberToObservationMap.insertMulti(observationNumber, bundleObservation);
@@ -191,6 +183,15 @@ namespace Isis { 
      }



    }



    // If it's an ISIS observation, setup the camera based on the solve settings

    if (isIsisObservation) {

      QSharedPointer<IsisBundleObservation> isisObs = qSharedPointerDynamicCast<IsisBundleObservation>(bundleObservation);

      isisObs->initializeExteriorOrientation();

      if (bundleSettings->solveTargetBody()) {

        isisObs->initializeBodyRotation();

      }

    }

    return bundleObservation;

  }