Commit ca8e5d3f authored by Stuart Sides's avatar Stuart Sides
Browse files

Merge of New Horizons into trunk Ref #1963, 1898, 2229 

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

isis/src/newhorizons/apps/leisa2isis/tsts/badfiles/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	# Test for existance of the MISSION keyword in the main FITS image label

	$(SED) 's+MISSION = '"'"'New Horizons+MISSIOx = '"'"'New Horizons+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+MISSION = '"'"'New Horizons+MISSIOx = '"'"'New Horizons+' \

	    $(INPUT)/lsb_0034933739_0x53c_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -15,7 +15,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_mission-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the value of the MISSION keyword in the main FITS image label

	$(SED) 's+MISSION = '"'"'New Horizons+MISSION = '"'"'NewXHorizons+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+MISSION = '"'"'New Horizons+MISSION = '"'"'NewXHorizons+' \

	    $(INPUT)/lsb_0034933739_0x53c_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -26,7 +26,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_mission-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the existance of the INSTR keyword in the main FITS image label

	$(SED) 's+INSTRU  = '"'"'lei+INSTRz  = '"'"'lei+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+INSTRU  = '"'"'lei+INSTRz  = '"'"'lei+' \

	    $(INPUT)/lsb_0034933739_0x53c_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -37,7 +37,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_instru-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the value of the INSTRU keyword in the main FITS image label

	$(SED) 's+INSTRU  = '"'"'lei+INSTRU  = '"'"'leY+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+INSTRU  = '"'"'lei+INSTRU  = '"'"'leY+' \

	    $(INPUT)/lsb_0034933739_0x53c_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \

isis/src/newhorizons/apps/mvic2isis/tsts/badcal/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	# Tests for when a calibrated file does not have some of the expected keys

	$(SED) \

	LC_CTYPE=C && LANG=C && $(SED) \

	  -e 's+PIXSIZE+PIX-IZE+' \

	  -e 's+PIXFOV+PIX-OV+' \

	  -e 's+GAIN+GA-N+' \

isis/src/newhorizons/apps/mvic2isis/tsts/badfiles/Makefile

+11 −11
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	# Test for existance of the MISSION keyword in the main FITS image label

	$(SED) 's+MISSION = '"'"'New Horizons+MISSIOx = '"'"'New Horizons+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+MISSION = '"'"'New Horizons+MISSIOx = '"'"'New Horizons+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -15,7 +15,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_mission-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the value of the MISSION keyword in the main FITS image label

	$(SED) 's+MISSION = '"'"'New Horizons+MISSION = '"'"'NewXHorizons+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+MISSION = '"'"'New Horizons+MISSION = '"'"'NewXHorizons+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -26,7 +26,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_mission-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the existance of the INSTR keyword in the main FITS image label

	$(SED) 's+INSTRU  = '"'"'mvi+INSTRz  = '"'"'mvi+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+INSTRU  = '"'"'mvi+INSTRz  = '"'"'mvi+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -37,7 +37,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_instru-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for the value of the INSTRU keyword in the main FITS image label

	$(SED) 's+INSTRU  = '"'"'mvi+INSTRU  = '"'"'mvY+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+INSTRU  = '"'"'mvi+INSTRU  = '"'"'mvY+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -48,7 +48,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_instru-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the undistorted extension is not what we are expecting

	$(SED) 's+COMMENT This is the bias-subtracted+COMzENT This is the bias-subtracted+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+COMMENT This is the bias-subtracted+COMzENT This is the bias-subtracted+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -60,7 +60,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-undistorted-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the undistorted extension is not what we are expecting

	$(SED) 's+COMMENT This is the bias-subtracted+COMMENT XYZs is the bias-subtracted+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+COMMENT This is the bias-subtracted+COMMENT XYZs is the bias-subtracted+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -72,7 +72,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-undistorted-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the error extension is not what we are expecting

	$(SED) 's+COMMENT+CO-MENT+g' \

	LC_CTYPE=C && LANG=C && $(SED) 's+COMMENT+CO-MENT+g' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -84,7 +84,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-error-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the error extension is not what we are expecting

	$(SED) 's+COMMENT  1-sigma error per pixel for the image in extension 1+COMMENT  1-sigXY error per pixel for the image in extension 1+' \

	LC_CTYPE=C && LANG=C &&$(SED) 's+COMMENT  1-sigma error per pixel for the image in extension 1+COMMENT  1-sigXY error per pixel for the image in extension 1+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -96,7 +96,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-error-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the quality extension is not what we are expecting

	$(SED) 's+COMMENT+CO-MENT+g' \

	LC_CTYPE=C && LANG=C && $(SED) 's+COMMENT+CO-MENT+g' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -108,7 +108,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-quality-key.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for throwing if the quality extension is not what we are expecting

	$(SED) 's+COMMENT Data quality flag for the image in extension 1+COMMENT Data quality flag for the image in exXYZsion 1+' \

	LC_CTYPE=C && LANG=C && $(SED) 's+COMMENT Data quality flag for the image in extension 1+COMMENT Data quality flag for the image in exXYZsion 1+' \

	    $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \
@@ -120,7 +120,7 @@ commands: 
	$(SED) 's/\[.*\/\(temp.fit\)\]/[\1]/' < $(OUTPUT)/temp.txt > $(OUTPUT)/error_comment-quality-value.txt;

	$(RM) $(OUTPUT)/temp.txt $(OUTPUT)/temp.fit;

	# Test for missing NAIF ID

	$(SED) 's+SPCSCID =+SPCxCID =+' $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	LC_CTYPE=C && LANG=C && $(SED) 's+SPCSCID =+SPCxCID =+' $(INPUT)/mpf_0035126517_0x539_sci_1.fit > $(OUTPUT)/temp.fit

	if [ `$(APPNAME) \

	  from=$(OUTPUT)/temp.fit \

	  to=$(OUTPUT)/junk.cub \