Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get jigsaw tests passing on csmbundle branch #4413

Merged
merged 11 commits into from
Apr 22, 2021
Merged

Get jigsaw tests passing on csmbundle branch #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7e07b61
Add virtuals to AbstractBundleObservation and get compiling again
Apr 20, 2021
5fc2366
Remove function from parent
Apr 20, 2021
6b4352f
Get existing jigsaw tests passing
Apr 21, 2021
0b589b4
Remove unneeded functions from BundleObservation
Apr 21, 2021
8b755a4
Try to fix weird merge issue
Apr 21, 2021
7efccba
Clean up a bit more
Apr 21, 2021
70c0303
Clean up BundleObservation and AbstractBundleObservation more
Apr 22, 2021
fb4dbc9
Remove unneeded BodyRotation
Apr 22, 2021
9a48568
Add target body solve back into bundle adjusment calc
Apr 22, 2021
f3f3696
Remove debug output
Apr 22, 2021
dbfc467
Removed unneeded memeber variables BundleObservation
Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions isis/src/control/objs/BundleAdjust/BundleAdjust.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ namespace Isis {
throw IException(IException::Programmer, msg, _FILEINFO_);
}

// TODO ISIS vs. CSM (addNewIsisObservation?)
AbstractBundleObservationQsp observation =
m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings);

Expand All @@ -436,9 +437,11 @@ namespace Isis {
}

// initialize exterior orientation (spice) for all BundleImages in all BundleObservations
//
// TODO!!! - should these initializations just be done when we add the new observation above?
m_bundleObservations.initializeExteriorOrientation();

// TODO
if (m_bundleSettings->solveTargetBody()) {
m_bundleObservations.initializeBodyRotation();
}
Expand Down Expand Up @@ -2164,8 +2167,10 @@ namespace Isis {
observation->applyParameterCorrections(subrange(m_imageSolution,t,t+numParameters));

if (m_bundleSettings->solveTargetBody()) {
// TODO: needs to be updated for ISIS vs. CSM CSM has no updateBodyRotation
// observation->updateBodyRotation();
// TODO: needs to be updated for ISIS vs. CSM CSM has no updateBodyRotation]
// TODO: this is no good.
QSharedPointer<BundleObservation> isisObservation = qSharedPointerDynamicCast<BundleObservation>(observation);
isisObservation->updateBodyRotation();
}

t += numParameters;
Expand Down
1 change: 1 addition & 0 deletions isis/src/control/objs/BundleUtilities/AbstractBundleObservation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ namespace Isis {
* settings for this AbstractBundleObservation
*/
const BundleObservationSolveSettingsQsp AbstractBundleObservation::solveSettings() {
// NEEDED for BundleMeasure
return m_solveSettings;
}

Expand Down
19 changes: 9 additions & 10 deletions isis/src/control/objs/BundleUtilities/AbstractBundleObservation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ namespace Isis {

QString instrumentId();

LinearAlgebra::Vector &parameterWeights();
LinearAlgebra::Vector &parameterCorrections();
LinearAlgebra::Vector &aprioriSigmas();
LinearAlgebra::Vector &adjustedSigmas();
virtual LinearAlgebra::Vector &parameterWeights();
virtual LinearAlgebra::Vector &parameterCorrections();
virtual LinearAlgebra::Vector &aprioriSigmas();
virtual LinearAlgebra::Vector &adjustedSigmas();

virtual const BundleObservationSolveSettingsQsp solveSettings();
int numberParameters();
virtual bool applyParameterCorrections(LinearAlgebra::Vector corrections);

// TODO: remove later
virtual const BundleObservationSolveSettingsQsp solveSettings();
virtual int numberParameters();
virtual bool applyParameterCorrections(LinearAlgebra::Vector corrections);

virtual void bundleOutputString(std::ostream &fpOut,bool errorPropagation);
virtual QString bundleOutputCSV(bool errorPropagation);
Expand All @@ -87,17 +88,15 @@ namespace Isis {
QStringList m_imageNames; //!< List of all cube names.
QString m_instrumentId; //!< Spacecraft instrument id.

BundleObservationSolveSettingsQsp m_solveSettings; //!< Solve settings for this observation.

// TODO??? change these to LinearAlgebra vectors...
LinearAlgebra::Vector m_weights; //!< Parameter weights.
//! Cumulative parameter correction vector.
LinearAlgebra::Vector m_corrections;
//LinearAlgebra::Vector m_solution; //!< parameter solution vector.
//! A posteriori (adjusted) parameter sigmas.
LinearAlgebra::Vector m_aprioriSigmas;
//! A posteriori (adjusted) parameter sigmas.
LinearAlgebra::Vector m_adjustedSigmas;
BundleObservationSolveSettingsQsp m_solveSettings; //!< Solve settings for this observation.
};

//! Typdef for AbstractBundleObservation QSharedPointer.
Expand Down
Loading