Commit a8d35d80 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Merged trunk r6024 through r6045 from the trunk into the ipce branch. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6047 41f8697f-d340-4b68-9986-7bafba869bb8
parents 66aca474 5a660d88

isis/scripts/csvdiff.py

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ if len(sys.argv) >= 4: 
  # Break each line into a column part for each CSV and a tolerance component

  tolerances = tolerance_file.readlines()

  for line in tolerances:

    if line.strip() != '':

      column, tolerance = line.strip().upper().split("=")

      tolerance_map[column] = float(tolerance)

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.csv name=BodyRotation > /dev/null;

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

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

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

	tabledump from=$(OUTPUT)/apolloPanImageOutput.cub to=$(OUTPUT)/FiducialMeasurementTable.csv name="Fiducial Measurement" > /dev/null;

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

isis/src/base/apps/crop/crop.cpp

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ void IsisMain() { 
  ns = ceil((double)(es - ss + 1) / sinc);

  nl = ceil((double)(el - sl + 1) / linc);

  nb = eb;

  if (ns == 0) ns = 1;

  if (nl == 0) nl = 1;

  //if (ns == 0) ns = 1;

  //if (nl == 0) nl = 1;

  es = ss + (ns - 1) * sinc;

  el = sl + (nl - 1) * linc;

isis/src/base/apps/crop/crop.xml

+3 −0
Original line number Diff line number Diff line
@@ -309,6 +309,9 @@ End_Group 
     <change name="Ella Mae Lee" date="2014-04-02">

      Updated the documentation, fixes #1622 and #1688.

    </change>

    <change name="Jeffrey Covington" date="2015-01-15">

      Removed unreachable code.

    </change>

  </history>



  <oldName>