Commit 4e46d6be authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Improved deltack per coding standards. This change merged from IPCE branch. 

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

isis/src/control/apps/deltack/deltack.xml

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ 
      Added check for history group in input cube. If it's there, add a new entry. If not, add a

      new history group. Added an app test. Fixes #1350.

    </change>

    <change name="Jeannie Backer" date="2014-07-23">

      Modified to create a bundle settings object for the bundle adjustment.

    </change>

    <change name="Ian Humphrey and Makayla Shepherd" date="2015-09-01">

      Changed code to accommodate changes in Sensor and Camera relationships.

    </change>

isis/src/control/apps/deltack/tsts/hist/Makefile

+3 −2
Original line number Diff line number Diff line 
# 2014-07-23 JWB - Removed extraneous "\"s

APPNAME  = deltack



include $(ISISROOT)/make/isismake.tsts



commands:

	$(CP) $(INPUT)/*.cub $(OUTPUT);              \

	$(CP) $(INPUT)/*.cub $(OUTPUT);

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

	  twist=false                     \

	  maxit=10                        \

	  samp1=731.875                   \

	  line1=669.375                   \

	  lat1=-26.439008370134           \

	  lon1= 352.19745020451 > /dev/null;         \

	  lon1= 352.19745020451 > /dev/null;         

	cathist from=$(OUTPUT)/vik.cub > $(OUTPUT)/pvlTruth.pvl;

	$(RM) bundleout.txt > /dev/null; 

	$(RM) residuals.csv > /dev/null;

isis/src/control/apps/deltack/tsts/singlePoint/Makefile

+6 −4
Original line number Diff line number Diff line 
APPNAME = deltack

#This file tests the single point (don't solve for twist) option

#

# 2014-07-23 JWB - Added semicolon to first command.

APPNAME = deltack



include $(ISISROOT)/make/isismake.tsts



commands:

	$(CP) $(INPUT)/*.cub $(OUTPUT)

	$(CP) $(INPUT)/*.cub $(OUTPUT);

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

	twist=false \

	maxit=10 \
@@ -12,7 +14,7 @@ commands: 
	line1=669.375 \

	lat1=-26.439008370134 \

	lon1= 352.19745020451 > /dev/null;

	cat bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	$(CAT) bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  | sed 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	  | sed s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \
@@ -24,7 +26,7 @@ commands: 
	# 1. remove cube filename paths

	# 2. remove digits beyond the fifth decimal place of decimal numbers

	# 3. remove date and time

	cat residuals.csv \

	$(CAT) $(OUTPUT)/residuals.csv \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  > $(OUTPUT)/residuals.csv

	$(RM) bundleout.txt > /dev/null;

isis/src/control/apps/deltack/tsts/twist/Makefile

+3 −3
Original line number Diff line number Diff line 
APPNAME = deltack

#This file tests the twist (2-point) option

#	tol=0.4194172 \

APPNAME = deltack



include $(ISISROOT)/make/isismake.tsts
@@ -17,7 +17,7 @@ commands: 
	line2=8264.78 \

	lat2=-0.3270664209085 \

	lon2=355.70986410595 > /dev/null;

	cat bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	$(CAT) bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  | sed 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	  | sed s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \
@@ -28,7 +28,7 @@ commands: 
	# 1. remove cube filename paths

	# 2. remove digits beyond the fifth decimal place of decimal numbers

	# 3. remove date and time

	cat residuals.csv \

	$(CAT) residuals.csv \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  > $(OUTPUT)/residuals.csv

	$(RM) bundleout.txt > /dev/null;