Commit b6111917 authored by Adam Goins's avatar Adam Goins
Browse files

Removed erreneous spacing, made adjustments consistent with last PR feedback

parent 98457e9c

isis/src/tgo/tsts/coloredMosaic/Makefile

+58 −65
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ commands: 
  	to=$(OUTPUT)/$\$$\1.cub -batchlist=$(OUTPUT)/redBasenames.lis > /dev/null;

	$(SPICE) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub \

  	SPKPREDICTED=true CKPREDICTED=true -batchlist=$(OUTPUT)/redBasenames.lis > /dev/null;

	$(LS) $(OUTPUT)/*-RED-*.cub > $(OUTPUT)/redCubes.lis;



	# Ingest Blu

	$(LS) $(INPUT)/*-BLU-*.xml > $(OUTPUT)/bluInputs.lis;
@@ -35,7 +34,6 @@ commands: 
  	to=$(OUTPUT)/$\$$\1.cub -batchlist=$(OUTPUT)/bluBasenames.lis > /dev/null;

	$(SPICE) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub \

  	SPKPREDICTED=true CKPREDICTED=true -batchlist=$(OUTPUT)/bluBasenames.lis > /dev/null;

	$(LS) $(OUTPUT)/*-BLU-*.cub > $(OUTPUT)/bluCubes.lis;



	# Ingest Pan

	$(LS) $(INPUT)/*-PAN-*.xml > $(OUTPUT)/panInputs.lis;
@@ -45,7 +43,6 @@ commands: 
		to=$(OUTPUT)/$\$$\1.cub -batchlist=$(OUTPUT)/panBasenames.lis > /dev/null;

	$(SPICE) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub \

		SPKPREDICTED=true CKPREDICTED=true -batchlist=$(OUTPUT)/panBasenames.lis > /dev/null;

	$(LS) $(OUTPUT)/*-PAN-*.cub > $(OUTPUT)/panCubes.lis;



	# Ingest Nir

	$(LS) $(INPUT)/*-NIR-*.xml > $(OUTPUT)/nirInputs.lis;
@@ -55,7 +52,6 @@ commands: 
  	to=$(OUTPUT)/$\$$\1.cub -batchlist=$(OUTPUT)/nirBasenames.lis > /dev/null;

	$(SPICE) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub \

  	SPKPREDICTED=true CKPREDICTED=true -batchlist=$(OUTPUT)/nirBasenames.lis > /dev/null;

	$(LS) $(OUTPUT)/*-NIR-*.cub > $(OUTPUT)/nirCubes.lis;



	# MAP FILE

	# Create list of all files.
@@ -78,8 +74,6 @@ commands: 
  	MINLAT = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLatitude grpname=Mapping`  \

  	MAXLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MaximumLongitude grpname=Mapping` \

  	MINLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLongitude grpname=Mapping` > /dev/null;

	$(EXPORT) $(TSTSARGS) from=$(OUTPUT)/redCassisMosaic.cub to=$(OUTPUT)/redCassisMosaic   \

             pdsversion=pds4 > /dev/null;



# Create Blu Mosaic

	$(PROJECT) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub to=$(OUTPUT)/$\$$\1_bluEqui.cub \
@@ -94,8 +88,6 @@ commands: 
  	MINLAT = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLatitude grpname=Mapping`  \

  	MAXLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MaximumLongitude grpname=Mapping` \

  	MINLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLongitude grpname=Mapping` > /dev/null;

	$(EXPORT) $(TSTSARGS) from=$(OUTPUT)/bluCassisMosaic.cub to=$(OUTPUT)/bluCassisMosaic   \

             pdsversion=pds4 > /dev/null;



# Create Pan Mosaic

	$(PROJECT) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub to=$(OUTPUT)/$\$$\1_panEqui.cub \
@@ -110,16 +102,6 @@ commands: 
   	MINLAT = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLatitude grpname=Mapping`  \

   	MAXLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MaximumLongitude grpname=Mapping` \

   	MINLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLongitude grpname=Mapping` > /dev/null;

	$(EXPORT) $(TSTSARGS) from=$(OUTPUT)/panCassisMosaic.cub to=$(OUTPUT)/panCassisMosaic  \

            pdsversion=pds4 > /dev/null;

	$(SED) 's+\Product_Observational.*>+\Product_Observational>+' \

    $(OUTPUT)/panCassisMosaic.xml > $(OUTPUT)/panCassisMosaic1.txt;

	$(SED) 's+\FSW_HEADER.*>+\FSW_HEADER>+' \

    $(OUTPUT)/panCassisMosaic1.txt > $(OUTPUT)/panCassisMosaic2.txt;

	$(SED) 's+\PEHK_HEADER.*>+\PEHK_HEADER>+' \

    $(OUTPUT)/panCassisMosaic2.txt > $(OUTPUT)/panCassisMosaic3.txt;

	$(SED) 's+\Modification_Detail.*>+\Modification_Detail>+' \

    $(OUTPUT)/panCassisMosaic3.txt > $(OUTPUT)/panCassisMosaic.txt;



# Create Nir Mosaic

	$(PROJECT) $(TSTARGS) from=$(OUTPUT)/$\$$\1.cub to=$(OUTPUT)/$\$$\1_nirEqui.cub \
@@ -134,8 +116,6 @@ commands: 
  	MINLAT = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLatitude grpname=Mapping`  \

  	MAXLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MaximumLongitude grpname=Mapping` \

  	MINLON = `$(GETKEY) from=$(OUTPUT)/equi.map keyword=MinimumLongitude grpname=Mapping` > /dev/null;

		$(EXPORT) $(TSTSARGS) from=$(OUTPUT)/nirCassisMosaic.cub to=$(OUTPUT)/nirCassisMosaic \

              pdsversion=pds4 > /dev/null;



# Create full color mos

	$(LS) $(OUTPUT)/*CassisMosaic.cub > $(OUTPUT)/mosaicList.txt;
@@ -144,10 +124,23 @@ commands: 
		pdsversion=pds4 > /dev/null;



	# Cleanup

	$(RM) $(OUTPUT)/*B1*cub;

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

	$(RM) $(OUTPUT)/*.xml;

	$(RM) $(OUTPUT)/*.img;

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

	$(RM) $(OUTPUT)/bluCassisMosaic.cub;

	$(RM) $(OUTPUT)/nirCassisMosaic.cub;

	$(RM) $(OUTPUT)/panCassisMosaic.cub;

	$(RM) $(OUTPUT)/redCassisMosaic.cub;





	$(RM) $(OUTPUT)/*CassisMosaic.xml;

	$(RM) $(OUTPUT)/*CassisMosaic1.txt;

	$(RM) $(OUTPUT)/*CassisMosaic2.txt;

	$(RM) $(OUTPUT)/*CassisMosaic3.txt;

	$(RM) $(OUTPUT)/coloredMosaic.img;

	$(RM) $(OUTPUT)/coloredMosaic.xml;

	$(RM) $(OUTPUT)/*Cubes.lis

	$(RM) $(OUTPUT)/*Inputs.lis

	$(RM) $(OUTPUT)/*Basenames.lis