Merge pull request #139 from jessemapel/rosetta (761b52a9) · Commits · aflab / astrogeology / ISIS3

isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.truth

+21 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Set undistorted coordinates
		Undistorted coordinates: (0.25, 0.1)

		Modify the coefficient matrices

		Set distorted coordinates
		Distorted coordinates: (1.0, 1.0)
		Undistorted coordinates: (10.0, -10.0)
		@@ -49,7 +50,7 @@ Spacecraft Name Short: Rosetta
		Instrument Name Long: Optical, Spectroscopic, and Infrared Remote Imaging System
		Instrument Name Short: OSIRIS

		For upper left of asteroid ...
		For upper left corner of asteroid ...
		DeltaSample = 0.000000000
		DeltaLine = 0.000000000

		@@ -68,3 +69,22 @@ DeltaLine = 0.000000000
		For center pixel position ...
		Latitude OK
		Longitude OK

		Test WAC with subwindowing...

		For upper left corner of asteroid ...
		DeltaSample = 0.000000000
		DeltaLine = 0.000000000

		For upper right corner of asteriod ...
		DeltaSample = 0.000000000
		DeltaLine = 0.000000000

		For lower left corner of asteriod...
		DeltaSample = 0.000000000
		DeltaLine = 0.000000000

		For lower right corner of asteroid...
		DeltaSample = 0.000000000
		DeltaLine = 0.000000000

isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp

+25 −8

Original line number	Diff line number	Diff line
		@@ -20,11 +20,12 @@ void TestLineSamp(Camera *cam, double samp, double line);
		int main(void) {
		Preference::Preferences(true);

		QString testCubeFile("$rosetta/testData/n20100710t154539230id20f22.cub");
		QString testNACFile("$rosetta/testData/n20100710t154539230id20f22.cub");
		QString testWACFile("$rosetta/testData/W20100710T153440162ID30F13.cub");

		cout << "Unit Test for RosettaOsirisCameraDistortionMap..." << endl;
		try {
		Cube c(testCubeFile, "r");
		Cube c(testNACFile, "r");
		Camera *cam = c.camera();
		RosettaOsirisCameraDistortionMap *testMap = new RosettaOsirisCameraDistortionMap(cam);
		cout << "Create default distortion map" << endl;
		@@ -54,7 +55,7 @@ int main(void) {
		<< toString( testMap->UndistortedFocalPlaneY() ) << ")" << endl;
		cout << endl;

		cout << "Modify the coefficient matrices" << endl;
		cout << "Modify the coefficient matrices" << endl << endl;
		LinearAlgebra::Matrix toUndistX = LinearAlgebra::zeroMatrix(4, 4);
		LinearAlgebra::Matrix toUndistY = LinearAlgebra::zeroMatrix(4, 4);
		toUndistX(0, 0) = 1.0; toUndistX(1, 1) = 2.0; toUndistX(2, 2) = 3.0; toUndistX(3, 3) = 4.0;
		@@ -147,7 +148,7 @@ int main(void) {
		double knownLat = 66.7031631205835680;
		double knownLon = 95.7688045622468422;

		Cube c(testCubeFile, "r");
		Cube c(testNACFile, "r");
		RosettaOsirisCamera cam = (RosettaOsirisCamera ) CameraFactory::Create(c);
		cout << "FileName: " << FileName(c.fileName()).name() << endl;
		cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;
		@@ -170,8 +171,8 @@ int main(void) {
		// Test four pixels to make sure the conversions are right

		// The asteroid doesn't fill the full image, and the kernels are imperfect
		// so,
		cout << "For upper left of asteroid ..." << endl;
		// so, test the corners of the asteroid
		cout << "For upper left corner of asteroid ..." << endl;
		TestLineSamp(cam, 400.0, 1300.0);

		cout << "For upper right corner of asteriod ..." << endl;
		@@ -205,6 +206,23 @@ int main(void) {
		else {
		cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;
		}

		cout << endl << "Test WAC with subwindowing..." << endl << endl;

		Cube wacCube(testWACFile, "r");
		RosettaOsirisCamera wideAngleCam = (RosettaOsirisCamera ) CameraFactory::Create(wacCube);

		cout << "For upper left corner of asteroid ..." << endl;
		TestLineSamp(wideAngleCam, 215.0, 230.0);

		cout << "For upper right corner of asteriod ..." << endl;
		TestLineSamp(wideAngleCam, 304.0, 235.0);

		cout << "For lower left corner of asteriod..." << endl;
		TestLineSamp(wideAngleCam, 230.0, 303.0);

		cout << "For lower right corner of asteroid..." << endl;
		TestLineSamp(wideAngleCam, 299.0, 312.0);
		}
		catch (IException &e) {
		e.print();
		@@ -231,4 +249,3 @@ void TestLineSamp(Camera *cam, double samp, double line) {
		cout << "DeltaLine = ERROR" << endl << endl;
		}
		}