Commit 5d065254 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Modified deltack XML and test Makefiles per coding standards. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6472 41f8697f-d340-4b68-9986-7bafba869bb8
parent d8bba1c9

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

+1 −2
Original line number Diff line number Diff line 
APPNAME  = deltack

#

# 2014-07-23 JWB - Removed extraneous "\"s

APPNAME  = deltack



include $(ISISROOT)/make/isismake.tsts

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

+2 −2
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
@@ -14,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/ \

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;