Removed bundleout.txt multiple solve settings output mode. References #4316. (1f7af311) · Commits · aflab / astrogeology / ISIS3

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -188,9 +188,6 @@ BundleSettingsQsp bundleSettings(UserInterface &ui) {

		QList<BundleObservationSolveSettings> solveSettingsList = observationSolveSettings(ui);
		settings->setObservationSolveOptions(solveSettingsList);
		if (ui.GetBoolean("USEPVL")) {
		settings->setSCPVLFilename(FileName(ui.GetFileName("SC_PARAMETERS")).expanded());
		}
		// convergence criteria
		settings->setConvergenceCriteria(BundleSettings::Sigma0,
		ui.GetDouble("SIGMA0"),

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+1 −24

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ namespace Isis {

		// Output Options
		m_outputFilePrefix = "";
		m_SCPVLFilename = "";
		}


		@@ -191,8 +190,7 @@ namespace Isis {
		m_maximumLikelihood(other.m_maximumLikelihood),
		m_solveTargetBody(other.m_solveTargetBody),
		m_bundleTargetBody(other.m_bundleTargetBody),
		m_outputFilePrefix(other.m_outputFilePrefix),
		m_SCPVLFilename(other.m_SCPVLFilename){
		m_outputFilePrefix(other.m_outputFilePrefix){
		}


		@@ -238,7 +236,6 @@ namespace Isis {
		m_bundleTargetBody = other.m_bundleTargetBody;
		m_maximumLikelihood = other.m_maximumLikelihood;
		m_outputFilePrefix = other.m_outputFilePrefix;
		m_SCPVLFilename = other.m_SCPVLFilename;
		}
		return *this;
		}
		@@ -1000,16 +997,6 @@ namespace Isis {
		}


		/**
		* Set the filename of the PVL file used to generate bundle observation settings in jigsaw.
		*
		* @param outputFilePrefix The absolute filename of the PVL file
		*/
		void BundleSettings::setSCPVLFilename(QString SCParamFilename) {
		m_SCPVLFilename = SCParamFilename;
		}


		/**
		* Retrieve the output file prefix. This string will be
		* appended to all of the output files created by the bundle
		@@ -1024,16 +1011,6 @@ namespace Isis {
		}


		/**
		* Retrieve the filename of the PVL file used to generate bundle observation settings in jigsaw.
		*
		* @return @b QString The absolute filename of the PVL file
		*/
		QString BundleSettings::SCPVLFilename() const {
		return m_SCPVLFilename;
		}


		/**
		* Create PvlObject with the given name containing the BundleSettings
		* information.

isis/src/control/objs/BundleSettings/BundleSettings.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -101,6 +101,8 @@ namespace Isis {
		* @history 2016-10-13 Ian Humphrey - Updated documentation and variable names for
		* observationSolveSettings(), as BundleObservationSolveSettings
		* are acquired by an associated observation number. References #4293.
		* @history 2016-10-17 Jesse Mapel - Removed m_SCPVLFilename parameter in accordance with
		* USEPVL being removed from jigsaw. References #4316.
		*
		* @todo Determine which XmlStackedHandlerReader constructor is preferred
		* @todo Determine which XmlStackedHandler needs a Project pointer (see constructors)
		@@ -396,10 +398,6 @@ namespace Isis {
		QString m_outputFilePrefix; /**< The prefix for all output files. If the user does not want
		output files to be written to the current directory, the
		output directory path should be included in this prefix.*/

		QString m_SCPVLFilename; /** The filename for the PVL file used by jigsaw to
		generate the observation solve settings. This should be
		empty unless SC_PARAMETERS was used in jigsaw.*/
		};
		// typedefs
		//! Definition for a BundleSettingsQsp, a shared pointer to a BundleSettings object.

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+111 −139

Original line number	Diff line number	Diff line
		@@ -747,6 +747,8 @@ namespace Isis {
		*
		* @throws IException::Io "Failed to output residual percentiles for bundleout"
		* @throws IException::Io "Failed to output residual box plot for bundleout"
		*
		* @todo Determine how multiple sensor solve settings should be output.
		*/
		bool BundleSolutionInfo::outputHeader(std::ofstream &fpOut) {

		@@ -874,12 +876,11 @@ namespace Isis {
		m_settings->convergenceCriteriaMaximumIterations());
		fpOut << buf;

		// Single Sensor Output
		if (m_settings->numberSolveSettings() == 1) {

		//TODO Should it be checked that positionSigmas.size() == positionSolveDegree and
		// pointingSigmas.size() == pointingSolveDegree somewhere? JAM

		//TODO How do we output this information when using multiple solve settings? JAM

		BundleObservationSolveSettings globalSettings = m_settings->observationSolveSettings(0);
		int pointingSolveDegree = globalSettings.numberCameraAngleCoefficientsSolved();
		QList<double> pointingSigmas = globalSettings.aprioriPointingSigmas();
		@@ -994,35 +995,6 @@ namespace Isis {
		sprintf(buf,"\n CAMERA ANGULAR ACCELERATION SIGMA: %lf (dd/s/s)",
		pointingSigmas[2]);
		fpOut << buf;
		}

		// Multiple Sensor Output
		else {
		sprintf(buf, "\n\nINPUT: GLOBAL IMAGE PARAMETER UNCERTAINTIES\n===========================================\n");
		fpOut << buf;
		(m_settings->globalLatitudeAprioriSigma() == Isis::Null) ?
		sprintf(buf,"\n POINT LATITUDE SIGMA: N/A"):
		sprintf(buf,"\n POINT LATITUDE SIGMA: %lf (meters)",
		m_settings->globalLatitudeAprioriSigma());
		fpOut << buf;
		(m_settings->globalLongitudeAprioriSigma() == Isis::Null) ?
		sprintf(buf,"\n POINT LONGITUDE SIGMA: N/A"):
		sprintf(buf,"\n POINT LONGITUDE SIGMA: %lf (meters)",
		m_settings->globalLongitudeAprioriSigma());
		fpOut << buf;
		(m_settings->globalRadiusAprioriSigma() == Isis::Null) ?
		sprintf(buf,"\n POINT RADIUS SIGMA: N/A"):
		sprintf(buf,"\n POINT RADIUS SIGMA: %lf (meters)",
		m_settings->globalRadiusAprioriSigma());
		fpOut << buf;

		if (!m_settings->SCPVLFilename().isEmpty()) {
		sprintf(buf, "\n\nSensor apriori sigmas and solve settings from PVL file:\n");
		fpOut << buf;
		sprintf(buf, m_settings->SCPVLFilename().toLatin1().data());
		fpOut << buf;
		}
		}

		if (m_settings->solveTargetBody()) {
		sprintf(buf, "\n\nINPUT: TARGET BODY OPTIONS\n==============================\n");

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,8 @@ namespace Isis {
		* @history 2016-10-06 Tyler Wilson - Added methods outputImagesCSV()
		* and outputImagesCSVHeader which enables jigsaw users to output
		* the bundleout_images.csv file. Fixes #4314.
		* @history 2016-10-17 Jesse Mapel - Removed multiple solve settings output in accordance with
		* USEPVL being removed from jigsaw. References #4316.
		*/
		class BundleSolutionInfo : public QObject {
		Q_OBJECT