Merge pull request #205 from makaylas/ipceClean (d2132161) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/Application/Application.cpp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -102,14 +102,6 @@ namespace Isis {
	strncpy(env, "LANG=en_US", 1023);		strncpy(env, "LANG=en_US", 1023);
	putenv(env);		putenv(env);

	// Verify ISISROOT was set
	if (getenv("ISISROOT") == NULL \|\| QString(getenv("ISISROOT")) == "") {
	QString message = "Please set ISISROOT before running any Isis "
	"applications";
	cerr << message << endl;
	abort();
	}

	// Get the starting cpu time, direct I/Os, page faults, and swaps		// Get the starting cpu time, direct I/Os, page faults, and swaps
	//p_startClock = clock();		//p_startClock = clock();
	p_startDirectIO = DirectIO();		p_startDirectIO = DirectIO();

isis/src/base/objs/EmbreeShapeModel/EmbreeShapeModel.cpp

+0 −44

Original line number	Original line	Diff line number	Diff line
	@@ -593,50 +593,6 @@ namespace Isis {
	}		}


	/**
	* Computes and returns emission angle, in degrees, given the observer
	* position. The surface normal vector is calculated using an ellipsoid, not
	* the local normal of the actual target shape.
	*
	* Emission Angle: The angle between the surface normal vector at the
	* intersection point and the vector from the intersection point to the
	* observer (usually the spacecraft). The emission angle varies from 0 degrees
	* when the observer is viewing the sub-spacecraft point (nadir viewing) to 90
	* degrees when the intercept is tangent to the surface of the target body.
	* Thus, higher values of emission angle indicate more oblique viewing of the
	* target.
	*
	* @param observerBodyFixedPosition Three dimensional position of the observer,
	* in the coordinate system of the target body.
	*
	* @return The emission angle, in decimal degrees.
	*
	*/
	double EmbreeShapeModel::emissionAngle(const std::vector<double> &observerBodyFixedPosition) {

	// If there is already a normal save it, because it's probably the local normal
	std::vector<double> localNormal;
	bool hadNormal = hasNormal();
	if ( hadNormal ) {
	localNormal = normal();
	}

	// Calculate the ellipsoid surface normal
	calculateDefaultNormal();

	// Use ShapeModel to calculate the ellipsoid emission angle
	double ellipsoidEmission = ShapeModel::emissionAngle(observerBodyFixedPosition);

	// If there's a saved normal, reset it
	if ( hadNormal ) {
	setNormal(localNormal);
	}

	// Return the ellipsoid emission angle
	return ellipsoidEmission;
	}


	/**		/**
	* Computes and returns incidence angle, in degrees, given the illuminator position.		* Computes and returns incidence angle, in degrees, given the illuminator position.
	* The surface normal vector is calculated using an ellipsoid, not the local		* The surface normal vector is calculated using an ellipsoid, not the local

isis/src/base/objs/EmbreeShapeModel/EmbreeShapeModel.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,8 @@ namespace Isis {
	*		*
	* @internal		* @internal
	* @history 2017-04-22 Jesse Mapel and Jeannie Backer - Original Version		* @history 2017-04-22 Jesse Mapel and Jeannie Backer - Original Version
			* @history 2018-05-01 Christopher Combs - Removed emissionAngle function to
			* fix issues with using ellipsoids to find normals. Fixes #5387.
	*/		*/
	class EmbreeShapeModel : public ShapeModel {		class EmbreeShapeModel : public ShapeModel {
	public:		public:
	@@ -84,10 +86,8 @@ namespace Isis {
	virtual void calculateSurfaceNormal();		virtual void calculateSurfaceNormal();
	QVector<double> ellipsoidNormal();		QVector<double> ellipsoidNormal();

	virtual double emissionAngle(const std::vector<double> &sB);
	virtual double incidenceAngle(const std::vector<double> &uB);		virtual double incidenceAngle(const std::vector<double> &uB);


	virtual Distance localRadius(const Latitude &lat, const Longitude &lon);		virtual Distance localRadius(const Latitude &lat, const Longitude &lon);

	// Determine if the internal intercept is occluded from the observer/lookdir		// Determine if the internal intercept is occluded from the observer/lookdir

isis/src/base/objs/Isis/Isis.h

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,14 @@ void InterruptSignal(int);
	* @return int		* @return int
	*/		*/
	int main(int argc, char *argv[]) {		int main(int argc, char *argv[]) {
			// Verify ISISROOT was set
			// Note: as printing and logging IExceptions requires ISISROOT to be set (for preferences),
			// The case below cannot be handled with IExceptions
			if (getenv("ISISROOT") == NULL \|\| QString(getenv("ISISROOT")) == "") {
			std::cerr << "Please set ISISROOT before running any Isis applications" << std::endl;
			exit(1);
			}

	#ifdef CWDEBUG		#ifdef CWDEBUG
	startMonitoringMemory();		startMonitoringMemory();
	signal(SIGSEGV, SegmentationFault);		signal(SIGSEGV, SegmentationFault);

isis/src/base/objs/PushFrameCameraCcdLayout/PushFrameCameraCcdLayout.truth

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ Get the METHANE filter layout
	METHANE filter ID: -61504		METHANE filter ID: -61504
	METHANE filter name: "METHANE"		METHANE filter name: "METHANE"
	METHANE filter start sample: 1		METHANE filter start sample: 1
	METHANE filter start line: 291		METHANE filter start line: 285
	METHANE filter samples: 1648		METHANE filter samples: 1648
	METHANE filter lines: 128		METHANE filter lines: 128

	@@ -39,7 +39,7 @@ Get the METHANE filter layout but give it a different name
	METHANE filter ID: -61504		METHANE filter ID: -61504
	METHANE filter name: "methane"		METHANE filter name: "methane"
	METHANE filter start sample: 1		METHANE filter start sample: 1
	METHANE filter start line: 291		METHANE filter start line: 285
	METHANE filter samples: 1648		METHANE filter samples: 1648
	METHANE filter lines: 128		METHANE filter lines: 128