Commit b4d7a6fd authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Removed Apollo control networks from findfeatures truth data. They are... 

PROG: Removed Apollo control networks from findfeatures truth data. They are not consistent across all platforms. References #1815

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

isis/src/control/apps/findfeatures/findfeatures.xml

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
      Updated the ImageSource class for proper use of the Histogram class for 

      conversion to 8-bit. 

    </change>

    <change name="Jeannie Backer" date="2016-03-11">

      Added program to ISIS package.

    </change>

  </history> 



  <groups>

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

+1 −0
Original line number Diff line number Diff line
@@ -25,3 +25,4 @@ commands: 
	       >& $(OUTPUT)/cubes.txt;

	$(RM) $(OUTPUT)/toList.txt;

	$(RM) $(OUTPUT)/apollo_nadir.lis;

	$(RM) $(OUTPUT)/apolloAS15_1583.net;

isis/src/control/apps/findfeatures/tsts/filters/Makefile

+20 −39
Original line number Diff line number Diff line
@@ -3,49 +3,30 @@ APPNAME = findfeatures 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/Sub4-AS15-M-0584_msk_cropped.cub > $(OUTPUT)/apollo_nadir.lis;



	$(APPNAME) algorithm="sift/sift" \

	           match=$(INPUT)/Sub4-AS15-M-0583_msk_cropped.cub \

	           fromlist=$(OUTPUT)/apollo_nadir.lis \

	           onet=$(OUTPUT)/apolloAS15_1583_none.net \

	           epitolerance=1.0 \

	           ratio=0.65 \

	           hmgtolerance=1.0 \

	$(APPNAME) from=$(INPUT)/EW0211981114G.lev1.cub \

	           match=$(INPUT)/EW0242463603G.lev1.cub \

	           algorithm=surf/surf \

	           onet=$(OUTPUT)/mess_sobel.net \

	           filter=sobel \

	           maxpoints=5000 \

	           networkid="ApolloAS15_0583_none" \

	           pointid="AS15_0583_sobel_????" \

	           description="Test Apollo 15 images - No Filter" \

	           debug=false \

	           networkid="Messenger Sobel" \

	           pointid="Messenger_sobel_????" \

	           description="Test Messenger - Sobel Filter" \

	           >& /dev/null; 



	$(APPNAME) algorithm="sift/sift" \

	           match=$(INPUT)/Sub4-AS15-M-0583_msk_cropped.cub \

	           fromlist=$(OUTPUT)/apollo_nadir.lis \

	           onet=$(OUTPUT)/apolloAS15_1583_sobel.net \

	           filter=sobel maxpoints=5000 \

	           epitolerance=1.0 \

	$(APPNAME) from=$(INPUT)/Sub4-AS15-M-0583_msk_cropped.cub \

	           match=$(INPUT)/Sub4-AS15-M-0584_msk_cropped.cub \

	           algorithm=sift/sift \

	           onet=$(OUTPUT)/app_scharr.net \

	           filter=scharr \

	           epitol=1.0 \

	           ratio=0.65 \

	           hmgtolerance=1.0 \

	           networkid="ApolloAS15_0583_sobel" \

	           pointid="AS15_0583_sobel_????" \

	           description="Test Apollo 15 images - Sobel Filter" \

	           debug=false \

	           >& /dev/null; 



	$(APPNAME) algorithm="sift/sift" \

	           match=$(INPUT)/Sub4-AS15-M-0583_msk_cropped.cub \

	           fromlist=$(OUTPUT)/apollo_nadir.lis \

	           onet=$(OUTPUT)/apolloAS15_1583_scharr.net \

	           epitolerance=1.0 \

	           ratio=0.65 \

	           hmgtolerance=1.0 \

	           filter=scharr maxpoints=5000 \

	           networkid="ApolloAS15_0583_scharr" \

	           pointid="AS15_0583_scharr_????" \

	           description="Test Apollo 15 images - Scharr Filter" \

	           hmg=1.0 \

	           maxpoints=5000 \

	           debug=false \

	           networkid="Apollo Scharr" \

	           pointid="Apollo_scharr_????" \

	           description="Test Apollo - Scharr Filter" \

	           >& /dev/null; 



	$(RM) $(OUTPUT)/apollo_nadir.lis; 
	# remove apollo network - not same across all platforms

	$(RM) $(OUTPUT)/app_scharr.net;