Unverified Commit 7fb2583a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

more jigsaw tests (#4116) 



* jigsaw to app conversion and remove unnecessary tests

* Updated based on comments

* Updated spacing

* Adds apollo fixture for jigsaw tests

* Updated to use pvl control network

* added error tests

* started new test

* first take

* finished mestrimator test

* removed things

* more merge conflicts

* added bp tests

* new tests

* more moerge conflicts

* deleted old tests

* added rejection test

* proper tmp dirs

* addressing comments

Co-authored-by: default avatarKristin <kberry@usgs.gov>
parent 411d802f

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

deleted100644 → 0
+0 −191
Original line number Diff line number Diff line 
APPNAME = jigsaw

# These tests exercise the bundle adjustment of Apollo images using the bundleXYZ options

# These tests should probably be replaced with Bennu data or other more appropriate data.

# Solving for position, angles (with twist), and radius with error propagation.

#

# 2018-10-12 Debbie A. Cook - original test

# 2018-10-22 Jesse Mapel - Added DIFF file for control network. Reduced number of

#                          decimals in CSVs.



# The "cat bundleout.txt" command in these tests uses sed to do the following (in order):

# 1. remove cube filename paths

# 2. remove net filename paths

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

#  TODO Change truncation to at least 7th decimal place for free tests

# 4. remove date and time



include $(ISISROOT)/make/isismake.tsts



commands:

# test rect bundle with lat output some points constrained

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_7-ImageLSTest_USGS_combined.net \

	           onet=$(OUTPUT)/rect-latConstrained_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           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)/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' \

	       > $(OUTPUT)/rect-latConstrained_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) 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

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_free.net \

	           onet=$(OUTPUT)/rectFree_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

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

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

	       > $(OUTPUT)/rectFree_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) 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

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_free.net \

	           onet=$(OUTPUT)/lat-rectFree_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=LAT \

	           control_point_coordinate_type_reports=RECT \

		   bundleout_txt=no \

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

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

	       > $(OUTPUT)/lat-rectFree_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) print.prt > /dev/null;

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



# test lat bundle and rect output with some constrained points

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_7-ImageLSTest_USGS_combined.net \

	           onet=$(OUTPUT)/lat-rectConstrained_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           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)/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' \

	       > $(OUTPUT)/lat-rectConstrained_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) print.prt > /dev/null;

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



# test rect bundle and rect output with some constrained points

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_7-ImageLSTest_USGS_combined.net \

	           onet=$(OUTPUT)/rectConstrained_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           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)/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' \

	       > $(OUTPUT)/rectConstrained_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) 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

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_free.net \

	           onet=$(OUTPUT)/rect-latFree_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=RECT \

	           control_point_coordinate_type_reports=LAT \

		   bundleout_txt=no \

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

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

	       > $(OUTPUT)/rect-latFree_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) print.prt > /dev/null;

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

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



# test lat bundle and lat output with a free network (all points free) - (sigma 0 should match lat bundle with lat output

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_free.net \

	           onet=$(OUTPUT)/latFree_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           control_point_coordinate_type_bundle=LAT \

	           control_point_coordinate_type_reports=LAT \

		   bundleout_txt=no \

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

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

	       > $(OUTPUT)/latFree_residuals.csv;

	$(CAT) $(OUTPUT)/bundleout_images.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' \

	       > $(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) print.prt > /dev/null;

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

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

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

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
# This tests the HELDLIST paramater with a single image. We hold a green-filter image,

# N1597182807_2.filtered.cub, effectively setting any control points that intersect

# this image to FIXED, and setting these control points' a priori surface points to the

# corresponding measures' surface points in the held image. See the history of

# N1597182807_2.filtered.cub, as qtie was used before running the jigsaw.

#

# @history 2016-10-13 Ian Humphrey - Original version, adapted from test data provided by

#                         Tammy Becker. References #4293.

APPNAME = jigsaw



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) $(INPUT)/*cub > $(OUTPUT)/cubes.lis;

	$(LS) $(INPUT)/N1597182807_2.filtered.cub > $(OUTPUT)/hold-green.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cubes.lis \

	  heldlist=$(OUTPUT)/hold-green.lis \

	  cnet=$(INPUT)/color-tlb.net \

	  onet=$(OUTPUT)/color-tlb-out.net \

	  camera_angles_sigma=10 \

	  bundleout_txt=no \

	  > /dev/null;

	$(CAT) residuals.csv \

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

	  > $(OUTPUT)/hold_residuals.csv;

	$(CAT) bundleout_images.csv \

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

	       > bundleout_images1.csv;  

	$(MV) bundleout_points.csv $(OUTPUT)/hold_bundleout_points.csv;

	$(MV) bundleout_images1.csv $(OUTPUT)/hold_bundleout_images.csv;

	$(RM) bundleout_images.csv residuals.csv $(OUTPUT)/cubes.lis $(OUTPUT)/hold-green.lis;

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

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
APPNAME = jigsaw

# This test exercises the bundle adjustment of images from the Apollo frame camera.

# It is solving for position, angles (with twist), and radius using a two tier M-estimator approach.



# The "cat bundleout.txt" command in these tests uses sed to do the following (in order):

# 1. remove cube filename paths

# 2. remove net filename paths

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

# 4. remove date and time

#

# 2014-07-23 Jeannie Backer - Commented out references to bundleout_images.csv.  

#                Removed default parameters.

# 2016-08-11 Jeannie Backer - Updated documentation

# 2018-07-24 Debbie A. Cook - Now removing digits beyond the fourth decimal place of

#                        decimal numbers to make the mac test work.  Also changed

#                        "-0.0000" to "0.0000" after truncating.

include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis \

	           cnet=$(INPUT)/Ames_5-ImageLSTest_USGS_combined.net \

	           onet=$(OUTPUT)/mEstimator_out.net \

	           radius=yes \

	           model1=huber \

	           max_model1_c_quantile=0.6 \

	           model2=chen \

	           max_model2_c_quantile=.98 \

	           sigma0=1.e-3  \

	           maxits=150 \

		   bundleout_txt=no \

	           spsolve=position > /dev/null;

	$(CAT) residuals.csv | $(SED) 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\

	       > $(OUTPUT)/mEstimator_residuals.csv

	$(CAT) bundleout_images.csv | $(SED) 's/\/[^,]*\/\([^,\/]*\.cub\)/\1/g' \

	       | 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' \

	       > $(OUTPUT)/mEstimator_bundleout_images.csv

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

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

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

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

isis/src/control/apps/jigsaw/tsts/pole-ra-dec-w0-wDot-mean-radius/Makefile

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
APPNAME = jigsaw



# 2016-10-31 Tyler Wilson This test exercises the bundle adjustment of images from Enceladus 

# when the target body Enceladus when the target body parameter file is used.  This particular

# test sets the RadiusSolveOption to mean.

# 2018-07-24 Debbie A. Cook Changed the SED commands to remove digits beyond the second

# decimal place instead of the third to get the MacOS test to match.  Also changed

#                        "-0.00" to "0.00" after truncating.





# The "cat bundleout.txt" command in these tests uses perl and sed to do the following (in order):

# 1. remove cube filename paths.

# 2. remove net filename paths.

# 3. remove digits beyond the second decimal place of decimal numbers.

# 4. remove date and time.



# The "cat bundleout_images.csv/residuals.csv" commands uses perl to:

# 1. remove cube filename paths.

# 2. remove net filename paths.





include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cubes.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cubes.lis cnet=$(INPUT)/enc_global_fin2-cl14_forken_extract_cl-salih-lon-constrained.net \

	onet=$(OUTPUT)/mean.net errorpropagation=yes solvetargetbody=yes camera_angles_sigma=2.0 tbparameters=$(INPUT)/EnceladusTargetBodyParameters-pole-ra-dec-w0-wDot-mean-radius.pvl \

	bundleout_txt=no \

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

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

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

	       > $(OUTPUT)/pole-ra-dec-w0-wDot-mean-radius_bundleout_images.csv;

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

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

	       > $(OUTPUT)/pole-ra-dec-w0-wDot-mean_radius_residuals.csv;

#$(MV) $(OUTPUT)/bundleout_images1.csv $(OUTPUT)/pole-ra-dec-w0-wDot-mean-radius_bundleout_images.csv > /dev/null;

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

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/pole-ra-dec-w0-wDot-mean-radius_bundleout_points.csv > /dev/null;

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

	$(MV) $(OUTPUT)/mean.net $(OUTPUT)/out-pole-ra-dec-w0-wDot-mean-radiius.net > /dev/null;

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

isis/src/control/apps/jigsaw/tsts/pole-ra-dec-w0-wDot-triaxial-radii/Makefile

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
APPNAME = jigsaw



# 2016-10-31 Tyler Wilson This test exercises the bundle adjustment of images from Enceladus 

# when the target body Enceladus when the target body parameter file is used.  This particular

# test sets the RadiusSolveOption to triaxial.





# The "cat bundleout.txt" command in these tests uses perl and sed to do the following (in order):

# 1. remove cube filename paths.

# 2. remove net filename paths.

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

# 4. remove date and time.



# The "cat bundleout_images.csv/residuals.csv" commands uses perl to:

# 1. remove cube filename paths.

# 2. remove net filename paths.





#triaxial test



include $(ISISROOT)/make/isismake.tsts

#jigsaw fromlist=cubes.lis cnet=input/enc_global_fin2-cl14_forken_extract_cl-salih-lon-constrained.net onet=triaxial.net 

#errorpropagation=yes solvetargetbody=yes 

#tb_parameters=input/EnceladusTargetBodyParameters-pole-ra-dec-w0-wDot-triaxial-radii.pvl camera_angles_sigma=2.0

commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cubes.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cubes.lis cnet=$(INPUT)/enc_global_fin2-cl14_forken_extract_cl-salih-lon-constrained.net \

	onet=$(OUTPUT)/triaxial.net errorpropagation=yes solvetargetbody=yes tbparameters=$(INPUT)/EnceladusTargetBodyParameters-pole-ra-dec-w0-wDot-triaxial-radii.pvl \

	bundleout_txt=no \

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

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

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

	       > $(OUTPUT)/pole-ra-dec-w0-wDot-triaxial-radii_bundleout_images.csv;

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

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

	       > $(OUTPUT)/pole-ra-dec-w0-wDot-triaxial-radii_residuals.csv;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/pole-ra-dec-w0-wDot-triaxial-radii_bundleout_points.csv > /dev/null;

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

	$(MV) $(OUTPUT)/triaxial.net $(OUTPUT)/out-pole-ra-dec-w0-wDot-triaxial-radii.net > /dev/null;

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

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