Commit a345fe01 authored by acpaquette's avatar acpaquette Committed by Jesse Mapel
Browse files

Bundle Output Test Update (#3414) 

* Rebased off of dev

* Reset bundleObservation cpp

* Removed duplicate outputs

* Updates deltack tests with bundle changes
parent ac49b8b9

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

+1 −9
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ commands: 
	line1=669.375 \

	lat1=-26.439008370134 \

	lon1= 352.19745020451 > /dev/null;

	$(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/ \

	  | sed 's/\-0.00000/ 0.00000/' \

	  | sed 's/\-0.00000/ 0.00000/' \

	  | sed 's/PLIER:  /PLIER: /' \

	  > $(OUTPUT)/bundleout.txt

	# The above command uses sed to do the following (in order):

	# 1. remove cube filename paths

	# 2. remove digits beyond the fifth decimal place of decimal numbers
@@ -29,5 +21,5 @@ commands: 
	$(CAT) residuals.csv \

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

	  > $(OUTPUT)/residuals.csv

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

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

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

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

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ commands: 
	line2=8264.78 \

	lat2=-0.3270664209085 \

	lon2=355.70986410595 > /dev/null;

	$(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/ \

	  | sed 's/\-0.00000/ 0.00000/' \

	  | sed 's/PLIER:  /PLIER: /' \

	  > $(OUTPUT)/bundleout.txt

	# The above command uses sed to do the following (in order):

	# 1. remove cube filename paths

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

isis/src/control/apps/jigsaw/tsts/apollo/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -41,12 +41,8 @@ commands: 
	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           camera_angles_sigma=2. \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/apollo_bundleout.txt;

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

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

	       > $(OUTPUT)/apollo_residuals.csv;
@@ -55,6 +51,6 @@ commands: 
	       > $(OUTPUT)/apollo_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/apollo_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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

	$(RM) $(OUTPUT)/cube.lis print.prt > /dev/null;

isis/src/control/apps/jigsaw/tsts/bundleXYZ/Makefile

+14 −42
Original line number Diff line number Diff line
@@ -29,12 +29,8 @@ commands: 
	           camera_angles_sigma=2. \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=LAT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/rect-latConstrained_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -45,7 +41,7 @@ commands: 
	       > $(OUTPUT)/rect-latConstrained_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/rect-latConstrained_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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



# test rect bundle and rect output with a free network (all points free) - (sigma 0 should match lat bundle with rect output
@@ -56,12 +52,8 @@ commands: 
	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/rectFree_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -72,7 +64,7 @@ commands: 
	       > $(OUTPUT)/rectFree_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/rectFree_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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



# test lat bundle and rect output with a free network (all points free) - (sigma 0 should match rect bundle with rect outpu
@@ -83,12 +75,8 @@ commands: 
	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=LAT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/lat-rectFree_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -99,7 +87,7 @@ commands: 
	       > $(OUTPUT)/lat-rectFree_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/lat-rectFree_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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



# test lat bundle and rect output with some constrained points
@@ -113,12 +101,8 @@ commands: 
	           camera_angles_sigma=2. \

	           control_point_coordinate_type_bundle=LAT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/lat-rectConstrained_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -129,7 +113,7 @@ commands: 
	       > $(OUTPUT)/lat-rectConstrained_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/lat-rectConstrained_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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



# test rect bundle and rect output with some constrained points
@@ -143,12 +127,8 @@ commands: 
	           camera_angles_sigma=2. \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/rectConstrained_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -159,7 +139,7 @@ commands: 
	       > $(OUTPUT)/rectConstrained_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/rectConstrained_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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



# test rect bundle and lat output with a free network (all points free) - (sigma 0 should match lat bundle with lat output
@@ -170,12 +150,8 @@ commands: 
	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=LAT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/rect-latFree_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -186,7 +162,7 @@ commands: 
	       > $(OUTPUT)/rect-latFree_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/rect-latFree_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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

#	$(RM) $(OUTPUT)/cube.lis print.prt > /dev/null;
@@ -198,12 +174,8 @@ commands: 
	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=LAT \

	           control_point_coordinate_type_reports=LAT \

		   bundleout_txt=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(CAT) $(OUTPUT)/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]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/latFree_bundleout.txt;

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

	       | 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][0-9]*\)/\1/g' \
@@ -214,6 +186,6 @@ commands: 
	       > $(OUTPUT)/latFree_bundleout_images.csv;

	$(RM) $(OUTPUT)/bundleout_images.csv > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/latFree_bundleout_points.csv > /dev/null;

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

	$(RM) print.prt > /dev/null;

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

	$(RM) $(OUTPUT)/cube.lis print.prt > /dev/null;

isis/src/control/apps/jigsaw/tsts/camsolveAll/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -23,13 +23,8 @@ commands: 
	  update=yes \

	  cksolvedegree=3 \

	  camsolve=all \

	  bundleout_txt=no \

	  twist=no > /dev/null;

	$(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/ \

	       | $(SED) 's/\(Iterations:\).*/\1/' \

	       > $(OUTPUT)/obsmode_cholmod_bundleout.txt

	# The above command uses sed to do the following (in order):

	# 1. remove cube filename paths

	# 2. remove net filename paths
@@ -44,6 +39,5 @@ commands: 
	$(RM) residuals.csv > /dev/null;

	$(MV) bundleout_points.csv $(OUTPUT)/obsmode_cholmod_bundleout_points.csv > /dev/null;

	$(RM) $(OUTPUT)/cube.lis > /dev/null;

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

	cathist from=$(OUTPUT)/PSP_002733_1880_RED4.crop.cub > $(OUTPUT)/PSP4.pvl;

	cathist from=$(OUTPUT)/PSP_002733_1880_RED5.crop.cub > $(OUTPUT)/PSP5.pvl;