Commit 1f7ae496 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

Bug fix apollopaninit, vector cross product lines swapped; impacts application... 

Bug fix apollopaninit, vector cross product lines swapped; impacts application apollopaninit; references #2216

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6030 41f8697f-d340-4b68-9986-7bafba869bb8
parent 4f60c6b1

isis/src/apollo/apps/apollopaninit/apollopaninit.cpp

+3 −2
Original line number Diff line number Diff line
@@ -345,10 +345,11 @@ void IsisMain() { 
  //  The local normal cross the selenogrpahic z gives northPN (normal to the plane containing all 

  //  the north/south directions), that is, the plane containing the origin, the z axis, and the 

  //  primary point of intersection.

  crossp(northPN,norm,northL);   

  crossp(norm, zDir, northPN); 

  

  //The normal to the plane containing all the north/south directions cross the local normal 

  //  direction gives the local north/south direction in the local normal plane

  crossp(norm, zDir, northPN); 

  crossp(northPN,norm,northL);   

  if (northL[2] < 0) {  //if by chance we got the south direction change the signs

    northL[0] = -northL[0];

    northL[1] = -northL[1];

isis/src/apollo/apps/apollopaninit/tsts/default/Makefile

+11 −4
Original line number Diff line number Diff line 
APPNAME = apollopaninit



apolloPanImageOutput.cub.TOLERANCE = .000001



include $(ISISROOT)/make/isismake.tsts



commands:

	cp $(INPUT)/apolloPanImage.cub $(OUTPUT)/ > /dev/null;

	$(APPNAME) from = $(OUTPUT)/apolloPanImage.cub \

	cp $(INPUT)/apolloPanImage.cub $(OUTPUT)/apolloPanImageOutput.cub> /dev/null;

	$(APPNAME) from = $(OUTPUT)/apolloPanImageOutput.cub \

		Mission = "APOLLO15" \

		Microns = 50 \

		GMT = "1971-08-04 16:28:25.829" \
@@ -16,5 +18,10 @@ commands: 
		VEL_AZM = 292.6602745 \

		VEL_HORIZ = 1.6212918 \

		VEL_RADIAL = -0.0056892 > /dev/null;

	catlab from=$(OUTPUT)/apolloPanImage.cub to=$(OUTPUT)/label.pvl > /dev/null;

	$(RM) $(OUTPUT)/apolloPanImage.cub > /dev/null;
 
	catlab from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/label.pvl > /dev/null;

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/BodyRotationTable.txt name=BodyRotation > /dev/null;

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/SunPositionTable.txt name=InstrumentPointing > /dev/null;

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/InstrumentPositionTable.txt name=InstrumentPointing > /dev/null;

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/InstrumentPointingTable.txt name=InstrumentPointing > /dev/null;

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/FiducialMeasurementTable.txt name=InstrumentPointing > /dev/null;

	rm $(OUTPUT)/apolloPanImageOutput.cub > /dev/null;