Commit 1a3716b7 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Added multipleSensors test for testing observations and usepvl parameters....

Added multipleSensors test for testing observations and usepvl parameters. Removed redundant case01 test, renamed obsmode_cholmod_sparse to camsolveAll. Fixes #4122.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7054 41f8697f-d340-4b68-9986-7bafba869bb8
parent c476bf33
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
APPNAME = jigsaw
# This test exercises observation mode on HiRISE images, with update=yes
# Adapted originally from observation_mode_cholmod test.
#
# This test exercises the bundle adjustment of images from the HiRISE camera onboard MRO.
# sparse method with observation mode; solving for angles (3rd degree polynomial, using 
# camsolve=all).
#
# NOTE: This test can be removed if another test tests the CAMSOLVE=ALL option.
#
# 2014-07-23 Jeannie Backer - Commented out references to bundleout_images.csv.
#                Removed default parameters.
# 2016-08-11 Jeannie Backer - Updated documentation

# 2016-08-20 Ian Humphrey - Removed analogous case01 test and renamed this test from
#                observation_mode_cholmod to camsolveAll. References #4226.
include $(ISISROOT)/make/isismake.tsts

commands:
+0 −54
Original line number Diff line number Diff line
APPNAME = jigsaw

# This test exercises the bundle adjustment of images from the HiRISE camera onboard MRO
# with observation mode, solving for angles (3rd degree polynomial).

# The "cat t_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
# 5. remove the number of iterations that occurred
#
# 2014-07-23 Jeannie Backer - Changed method from oldsparse to default (sparse).
#                Commented out references to bundleout_images.csv.
#                Removed default parameters.
# 2015-07-30 Jeannie Backer - Changed file_prefix from "t" to "t_" since BundleAdjust
#                no longer adds the underscore. 
# 2016-07-27 Ian Humphrey -  Added the SED to remove iterations. This fixed the issue with macs
#                having slightly different iteration values in jigsaw observation mode tests
# 2016-08-11 Jeannie Backer - Updated documentation

include $(ISISROOT)/make/isismake.tsts

commands:
	$(CP) $(INPUT)/*.cub $(OUTPUT) > /dev/null;
	$(LS) -1 $(OUTPUT)/*.cub > $(OUTPUT)/cube.lis;
	$(APPNAME) fromlist=$(OUTPUT)/cube.lis \
	           cnet=$(INPUT)/redPntreg.net \
	           onet=$(OUTPUT)/case01OutNet.net \
	           observations=yes \
	           update=yes \
	           cksolvedegree=3 \
	           camsolve=all \
	           file_pre=t_ \
	           twist=no > /dev/null;
	$(CAT) t_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)/bundleout.txt
	$(CAT) t_residuals.csv | $(SED) 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\
	       > $(OUTPUT)/residuals.csv
#	$(CAT) t_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)/bundleout_images.csv
#	$(RM) t_bundleout_images.csv > /dev/null;
	$(MV) t_bundleout_points.csv $(OUTPUT)/bundleout_points.csv > /dev/null;
	$(RM) $(OUTPUT)/cube.lis > /dev/null;
	$(RM) t_bundleout.txt > /dev/null;
	$(RM) t_residuals.csv print.prt > /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;
+44 −0
Original line number Diff line number Diff line
# This is an observation test that tests sets of images corresponding to three different seonsors:
# Apollo Metric, LRO NAC, and Lunar Orbiter (LO).
# 
# Tested parameters:
#   USEPVL is used with SC_PARAMETERS to load settings for the different sensors.
#   Solve for radius of control points (RADIUS=yes) with uncertainty of 500m (POINT_RADIUS_SIGMA).
#   Treat each subframe as a single observation (OBSERVATIONS=yes).
#   Each output file will be prefixed by "temp_" (FILE_PREFIX=temp_).
#   Turn on error propagation (ERRORPROPAGATION=yes).
#
# 2016-08-20 Ian Humphrey - Original version adapted from
#                /work/projects/progteam/kedmundson/jigsaw_tests/multiple_sensors/ObservationMode/LO.
#                Fixes #4122.
APPNAME = jigsaw

include $(ISISROOT)/make/isismake.tsts

commands:
	$(LS) -1 $(INPUT)/*cub > $(OUTPUT)/AS15_LandingSide_Metric-NAC-LO5H-FIN.lis;
	$(APPNAME) fromlist=$(OUTPUT)/AS15_LandingSide_Metric-NAC-LO5H-FIN.lis \
	  cnet=$(INPUT)/AS15_LandingSide_Metric-NAC-LO5H-FIN.net \
	  onet=$(OUTPUT)/out.net \
	  usepvl=yes \
	  sc_parameters=$(INPUT)/APOLLO_LRONAC_LO.pvl \
	  observations=yes \
	  radius=yes \
	  errorpropagation=yes \
	  point_radius_sigma=500 \
	  file_prefix=temp_ \
	  > /dev/null
	$(CAT) temp_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)/multiSensors_bundleout.txt;
	$(CAT) temp_residuals.csv | $(SED) 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\
	  > $(OUTPUT)/multiSensors_residuals.csv;
	$(MV) temp_bundleout_points.csv $(OUTPUT)/multiSensors_bundleout_point.csv \
	  > /dev/null;
	$(RM) print.prt > /dev/null;
	$(RM) temp_* > /dev/null;
	$(RM) $(OUTPUT)/AS15_LandingSide_Metric-NAC-LO5H-FIN.lis > /dev/null;