diff --git a/isis/src/base/apps/spiceinit/tsts/shapemodel/Makefile b/isis/src/base/apps/spiceinit/tsts/shapemodel/Makefile deleted file mode 100644 index f1c58f71c4f65c0ba9b1991f96f9c0f0c9ec805d..0000000000000000000000000000000000000000 --- a/isis/src/base/apps/spiceinit/tsts/shapemodel/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Test spiceinit on a file which uses a shapemodel with the Renderer, etc specified in an -# IsisPreferences file. - -APPNAME = spiceinit - -include $(ISISROOT)/make/isismake.tsts - -commands: -# Test with IsisPreferences set for Embree - cp $(INPUT)/st_2458542208_v.cub $(OUTPUT)/ > /dev/null; - $(APPNAME) from=$(OUTPUT)/st_2458542208_v.cub shape=user \ - model='$$hayabusa/kernels/dsk/hay_a_amica_5_itokawashape_v1_0_64q.bds' \ - -pref=$(INPUT)/IsisPreferences_embree > /dev/null; - catlab from=$(OUTPUT)/st_2458542208_v.cub to=$(OUTPUT)/label_embree.pvl > /dev/null; - -# Test with IsisPreferences set for Bullet - $(APPNAME) from=$(OUTPUT)/st_2458542208_v.cub shape=user \ - model='$$hayabusa/kernels/dsk/hay_a_amica_5_itokawashape_v1_0_64q.bds' \ - -pref=$(INPUT)/IsisPreferences_bullet > /dev/null; - catlab from=$(OUTPUT)/st_2458542208_v.cub to=$(OUTPUT)/label_bullet.pvl > /dev/null; - -# Test for resetting back to the default (no Embree or Bullet) if nothing is specified - $(APPNAME) from=$(OUTPUT)/st_2458542208_v.cub -pref=$(INPUT)/IsisPreferences_default > /dev/null; - catlab from=$(OUTPUT)/st_2458542208_v.cub to=$(OUTPUT)/label_default.pvl > /dev/null; - rm $(OUTPUT)/st_2458542208_v.cub; diff --git a/isis/src/base/objs/Cube/Cube.truth b/isis/src/base/objs/Cube/Cube_truth.txt similarity index 100% rename from isis/src/base/objs/Cube/Cube.truth rename to isis/src/base/objs/Cube/Cube_truth.txt diff --git a/isis/src/base/objs/Cube/unitTest.cpp b/isis/src/base/objs/Cube/unitTest_disabled.cpp similarity index 92% rename from isis/src/base/objs/Cube/unitTest.cpp rename to isis/src/base/objs/Cube/unitTest_disabled.cpp index bdb62221e9891544cfad8b2fbdbfc656bfc8dfcc..d0cb588bede7c1bc6771b7d76e78dfad9f3bd43f 100644 --- a/isis/src/base/objs/Cube/unitTest.cpp +++ b/isis/src/base/objs/Cube/unitTest_disabled.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { // Test create and write methods cerr << "Creating 32-bit cube ... " << endl; out.setDimensions(150, 200, 2); - out.create("IsisCube_00"); + out.create("$TMP/IsisCube_00"); Report(out); cerr << "Write cube ... " << endl; @@ -55,12 +55,12 @@ int main(int argc, char *argv[]) { } // Copy returns the resulting Cube, we don't care about it (but we need it to flush) so delete - delete out.copy("IsisCube_01", CubeAttributeOutput()); + delete out.copy("$TMP/IsisCube_01", CubeAttributeOutput()); out.close(); // Test the open and read methods cerr << "Opening cube ... " << endl; - Cube in("IsisCube_01"); + Cube in("$TMP/IsisCube_01"); Report(in); cerr << "Comparing cube ... " << endl; @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) { out2.setFormat(Cube::Bsq); out2.setLabelSize(1000); out2.setPixelType(UnsignedByte); - out2.create("IsisCube_02"); + out2.create("$TMP/IsisCube_02"); j = 0; LineManager oline(out2); @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) { cerr << "Comparing cube ... " << endl; Cube in2; try { - in2.open("IsisCube_02"); + in2.open("$TMP/IsisCube_02"); } catch (IException &e) { e.print(); @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) { // out3.SetByteOrder(Msb); out2.setByteOrder(ISIS_LITTLE_ENDIAN ? Msb : Lsb); out3.setPixelType(SignedWord); - out3.create("IsisCube_03"); + out3.create("$TMP/IsisCube_03"); j = 0; LineManager oline3(out3); @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) { cerr << "Comparing cube ... " << endl; Cube in3; - in3.open("IsisCube_03"); + in3.open("$TMP/IsisCube_03"); Report(in3); j = 0; LineManager inLine3(in3); @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) { in3.close(); - in.open("IsisCube_01"); + in.open("$TMP/IsisCube_01"); // Test Histogram object on a single band, 1 by default cerr << "Testing histogram method, band 1 ... " << endl; @@ -278,7 +278,7 @@ int main(int argc, char *argv[]) { QList<QString> vbands; vbands.push_back("2"); in.setVirtualBands(vbands); - in.open("IsisCube_01"); + in.open("$TMP/IsisCube_01"); cerr << "Nbands = " << in.bandCount() << endl; cerr << "Band 1 = " << in.physicalBand(1) << endl; cerr << endl; @@ -297,7 +297,7 @@ int main(int argc, char *argv[]) { cerr << "Constructing cube ... " << endl << endl; Cube boundaryTestCube; boundaryTestCube.setDimensions(10, 10, 4); - boundaryTestCube.create("IsisCube_boundary"); + boundaryTestCube.create("$TMP/IsisCube_boundary"); Report(boundaryTestCube); LineManager boundaryLine(boundaryTestCube); @@ -381,7 +381,7 @@ int main(int argc, char *argv[]) { virtualBands.push_back("4"); virtualBands.push_back("2"); boundaryTestCube.setVirtualBands(virtualBands); - boundaryTestCube.open("IsisCube_boundary"); + boundaryTestCube.open("$TMP/IsisCube_boundary"); cerr << "Reading completely outside virtual band boundaries ... " << endl; readBrick.SetBasePosition(1, 1, 6); @@ -475,7 +475,7 @@ int main(int argc, char *argv[]) { Cube bsqOneLineTestCube; bsqOneLineTestCube.setDimensions(3, 1, 3); bsqOneLineTestCube.setFormat(Cube::Bsq); - bsqOneLineTestCube.create("IsisCube_bsqOneLine"); + bsqOneLineTestCube.create("$TMP/IsisCube_bsqOneLine"); Report(bsqOneLineTestCube); LineManager oneLine(bsqOneLineTestCube); @@ -501,7 +501,7 @@ int main(int argc, char *argv[]) { virtualBands.push_back("2"); virtualBands.push_back("3"); bsqOneLineTestCube.setVirtualBands(virtualBands); - bsqOneLineTestCube.open("IsisCube_bsqOneLine"); + bsqOneLineTestCube.open("$TMP/IsisCube_bsqOneLine"); for (int sb = 1; sb <= virtualBands.size(); sb++) { readLineBrick.SetBasePosition(1, 1, sb); bsqOneLineTestCube.read(readLineBrick); @@ -523,7 +523,7 @@ int main(int argc, char *argv[]) { virtualBands.push_back("3"); virtualBands.push_back("3"); bsqOneLineTestCube.setVirtualBands(virtualBands); - bsqOneLineTestCube.open("IsisCube_bsqOneLine"); + bsqOneLineTestCube.open("$TMP/IsisCube_bsqOneLine"); for (int sb = 1; sb <= virtualBands.size(); sb++) { readLineBrick.SetBasePosition(1, 1, sb); bsqOneLineTestCube.read(readLineBrick); @@ -544,7 +544,7 @@ int main(int argc, char *argv[]) { virtualBands.push_back("1"); virtualBands.push_back("5"); bsqOneLineTestCube.setVirtualBands(virtualBands); - bsqOneLineTestCube.open("IsisCube_bsqOneLine"); + bsqOneLineTestCube.open("$TMP/IsisCube_bsqOneLine"); for (int sb = 1; sb <= virtualBands.size(); sb++) { readLineBrick.SetBasePosition(1, 1, sb); bsqOneLineTestCube.read(readLineBrick); @@ -574,7 +574,7 @@ int main(int argc, char *argv[]) { virtualBands.push_back("1"); virtualBands.push_back("3"); bsqOneLineTestCube.setVirtualBands(virtualBands); - bsqOneLineTestCube.open("IsisCube_bsqOneLine"); + bsqOneLineTestCube.open("$TMP/IsisCube_bsqOneLine"); for (int sb = 1; sb <= virtualBands.size(); sb++) { readLineBrick.SetBasePosition(1, 1, sb); bsqOneLineTestCube.read(readLineBrick); @@ -598,7 +598,7 @@ int main(int argc, char *argv[]) { int limitExceeded = (1 << 28) + 1; largebsqTestCube.setDimensions(limitExceeded, 2, 1); largebsqTestCube.setFormat(Cube::Bsq); - largebsqTestCube.create("IsisCube_largebsq"); + largebsqTestCube.create("$TMP/IsisCube_largebsq"); Report(largebsqTestCube); cerr << endl; @@ -613,7 +613,7 @@ int main(int argc, char *argv[]) { // maxLineSize = 2^30 / (4 * 15000) = 17895 < 18000 bsqTestCube.setDimensions(15000, 18000, 1); bsqTestCube.setFormat(Cube::Bsq); - bsqTestCube.create("IsisCube_bsq"); + bsqTestCube.create("$TMP/IsisCube_bsq"); Report(bsqTestCube); cerr << endl; @@ -683,7 +683,7 @@ int main(int argc, char *argv[]) { try { Cube out; - out.create("IsisCube_04"); + out.create("$TMP/IsisCube_04"); out.close(); } catch (IException &e) { @@ -694,7 +694,7 @@ int main(int argc, char *argv[]) { Cube out; out.setLabelSize(15); out.setDimensions(1, 1, 1); - out.create("IsisCube_04"); + out.create("$TMP/IsisCube_04"); out.close(); } catch (IException &e) { @@ -704,7 +704,7 @@ int main(int argc, char *argv[]) { try { Cube out; out.setDimensions(1000000, 1000000, 9); - out.create("IsisCube_05"); + out.create("$TMP/IsisCube_05"); out.close(); } catch (IException &e) { @@ -712,7 +712,7 @@ int main(int argc, char *argv[]) { } try { Cube in; - in.open("IsisCube_01", "a"); + in.open("$TMP/IsisCube_01", "a"); } catch (IException &e) { e.print(); @@ -741,7 +741,7 @@ int main(int argc, char *argv[]) { Cube in4; try { - in4.open("$ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub"); + in4.open("$ISISTESTDATA/isis/src/base/unitTestData/$TMP/isisTruth.cub"); } catch (IException &e) { e.print(); @@ -767,7 +767,7 @@ int main(int argc, char *argv[]) { try { Cube externalData; externalData.setDimensions(1024, 1024, 1); - externalData.create("IsisCube_06"); + externalData.create("$TMP/IsisCube_06"); externalData.reopen("r"); externalData.putGroup(PvlGroup("TestGroup2")); } @@ -782,8 +782,8 @@ int main(int argc, char *argv[]) { cerr << endl << "Test creating an ecub" << endl; { Cube externalData; - externalData.setExternalDnData("$ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub"); - externalData.create("isisTruth_external.ecub"); + externalData.setExternalDnData("$ISISTESTDATA/isis/src/base/unitTestData/$TMP/isisTruth.cub"); + externalData.create("$TMP/isisTruth_external.ecub"); externalData.putGroup(PvlGroup("TestGroup")); cerr << *externalData.label() << endl; @@ -811,8 +811,8 @@ int main(int argc, char *argv[]) { cerr << endl << "Test creating an ecub from an ecub" << endl; { Cube externalData; - externalData.setExternalDnData("isisTruth_external.ecub"); - externalData.create("isisTruth_external2.ecub"); + externalData.setExternalDnData("$TMP/isisTruth_external.ecub"); + externalData.create("$TMP/isisTruth_external2.ecub"); cerr << *externalData.label() << endl; Brick readBrick(3, 3, 2, externalData.pixelType()); @@ -839,7 +839,7 @@ int main(int argc, char *argv[]) { cerr << endl << "Test reading an ecub" << endl; { Cube externalData; - externalData.open("isisTruth_external", "rw"); + externalData.open("$TMP/isisTruth_external", "rw"); externalData.putGroup(PvlGroup("TestGroup2")); externalData.reopen("r"); cerr << *externalData.label() << endl; @@ -868,7 +868,7 @@ int main(int argc, char *argv[]) { cerr << endl << "Test reading an ecub that points to another ecub" << endl; { Cube externalData; - externalData.open("isisTruth_external2"); + externalData.open("$TMP/isisTruth_external2"); cerr << *externalData.label() << endl; Brick readBrick(3, 3, 2, externalData.pixelType()); @@ -895,8 +895,8 @@ int main(int argc, char *argv[]) { //cerr << endl << "Test reading an ecub that points to detached lbl" << endl; //{ // Cube externalData; -// externalData.setExternalDnData("IsisCube_02.lbl"); -// externalData.create("isisTruth_external3.ecub"); +// externalData.setExternalDnData("$TMP/IsisCube_02.lbl"); +// externalData.create("$TMP/isisTruth_external3.ecub"); // cerr << *externalData.label() << endl; // // Brick readBrick(3, 3, 2, externalData.pixelType()); @@ -923,8 +923,8 @@ int main(int argc, char *argv[]) { //cerr << endl << "Test copying an ecub that points to detached lbl" << endl; //{ // Cube externalData; -// externalData.open("isisTruth_external3.ecub"); -// Cube *copiedCube = externalData.copy("isisTruth_external3.copy.ecub", +// externalData.open("$TMP/isisTruth_external3.ecub"); +// Cube *copiedCube = externalData.copy("$TMP/isisTruth_external3.copy.ecub", // CubeAttributeOutput("+External")); // cerr << *copiedCube->label() << endl; // @@ -954,22 +954,22 @@ int main(int argc, char *argv[]) { // //} - remove("IsisCube_00.cub"); - remove("IsisCube_01.cub"); - remove("IsisCube_02.cub"); - remove("IsisCube_02.lbl"); - remove("IsisCube_03.cub"); - remove("IsisCube_04.cub"); - remove("IsisCube_05.cub"); - remove("IsisCube_06.cub"); - remove("IsisCube_boundary.cub"); - remove("IsisCube_bsq.cub"); - remove("IsisCube_bsqOneLine.cub"); - remove("IsisCube_largebsq.cub"); - remove("isisTruth_external.ecub"); - remove("isisTruth_external2.ecub"); - remove("isisTruth_external3.ecub"); - remove("isisTruth_external3.copy.ecub"); + remove("$TMP/IsisCube_00.cub"); + remove("$TMP/IsisCube_01.cub"); + remove("$TMP/IsisCube_02.cub"); + remove("$TMP/IsisCube_02.lbl"); + remove("$TMP/IsisCube_03.cub"); + remove("$TMP/IsisCube_04.cub"); + remove("$TMP/IsisCube_05.cub"); + remove("$TMP/IsisCube_06.cub"); + remove("$TMP/IsisCube_boundary.cub"); + remove("$TMP/IsisCube_bsq.cub"); + remove("$TMP/IsisCube_bsqOneLine.cub"); + remove("$TMP/IsisCube_largebsq.cub"); + remove("$TMP/isisTruth_external.ecub"); + remove("$TMP/isisTruth_external2.ecub"); + // remove("$TMP/isisTruth_external3.ecub"); + // remove("$TMP/isisTruth_external3.copy.ecub"); return 0; } diff --git a/isis/src/dawn/tsts/dawn/Makefile b/isis/src/dawn/tsts/dawn/Makefile deleted file mode 100644 index 283b5a959b989449f4eaa16cb9582b0642fbdd83..0000000000000000000000000000000000000000 --- a/isis/src/dawn/tsts/dawn/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -APPNAME = ckwriter -APPNAME2 = spkwriter - -VIR = VIR_IR_1A_1_39574252_1.cub -FC = FC21B0001010_09049002212F5D.cub - -include $(ISISROOT)/make/isismake.tsts - -# Test Dawn camera models by spiciniting using default kernels, running campt on a few -# points then generating new kernels using ckwriter and spkwriter. Re-spiceiniting with those -# kernels, running campt on the same (s,l) and comparing the output values. - -# This test uses images of Mars for FC and Vesta for VIR - -# The two camera models tested and associated images are: -# VIR = VIR_IR_1B_1_393705064_1.cub -# FC = FC21B0001010_09049002212F5D.cub - -commands: - #cp images from input to output for prog15 - cp $(INPUT)/$(VIR) $(OUTPUT) > /dev/null; - cp $(INPUT)/$(FC) $(OUTPUT) > /dev/null; - - #initial spiceinit - spiceinit $(TSTARGS) from=$(OUTPUT)/$(VIR) > /dev/null; - spiceinit $(TSTARGS) from=$(OUTPUT)/$(FC) > /dev/null; - - #initial campt - - #9 points from VIR image - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=7 line=6 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=119 line=5 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=248 line=6 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=246 line=40 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=139 line=42 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=10 line=42 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=27 line=24 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=115 line=25 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn.pvl sample=211 line=27 > /dev/null; - - # 9 points from FC image - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=68 line=60 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=966 line=45 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=976 line=976 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=28 line=976 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=512 line=493 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=237 line=322 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=780 line=276 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=241 line=722 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn.pvl sample=823 line=739 > /dev/null; - - #ckwriter from spiceinit'd image to ckernel - # ckwriter will not work for VIR -- non-standard camera model using housekeeping data - #$(APPNAME) FROM=$(OUTPUT)/$(VIR) TO=$(OUTPUT)/ck_vir.bc > /dev/null; - $(APPNAME) FROM=$(OUTPUT)/$(FC) TO=$(OUTPUT)/ck_fc.bc > /dev/null; - - #spkwriter from spiceinit'd image to spkernel - $(APPNAME2) $(TSTARGS) FROM=$(OUTPUT)/$(VIR) TO=$(OUTPUT)/spk_vir.bsp > /dev/null; - $(APPNAME2) $(TSTARGS) FROM=$(OUTPUT)/$(FC) TO=$(OUTPUT)/spk_fc.bsp > /dev/null; - - #re-spiceinit inputs to generated kernels - spiceinit $(TSTARGS) from=$(OUTPUT)/$(VIR) SPK=$(OUTPUT)/spk_vir.bsp > /dev/null; - spiceinit $(TSTARGS) from=$(OUTPUT)/$(FC) CK=$(OUTPUT)/ck_fc.bc SPK=$(OUTPUT)/spk_fc.bsp > /dev/null; - - #final campt - - # 9 points from VIR image - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=7 line=6 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=119 line=5 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=248 line=6 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=246 line=40 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=139 line=42 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=10 line=42 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=27 line=24 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=115 line=25 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(VIR) to=$(OUTPUT)/dawn2.pvl sample=211 line=27 > /dev/null; - - # 9 points from FC image - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=68 line=60 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=966 line=45 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=976 line=976 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=28 line=976 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=512 line=493 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=237 line=322 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=780 line=276 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=241 line=722 > /dev/null; - campt $(TSTARGS) from=$(OUTPUT)/$(FC) to=$(OUTPUT)/dawn2.pvl sample=823 line=739 > /dev/null; - - #compare initial and final pvl #diff=$(OUTPUT)/tolerances.pvl - pvldiff $(TSTARGS) from=$(OUTPUT)/dawn.pvl from2=$(OUTPUT)/dawn2.pvl diff=$(INPUT)/tolerances.pvl \ - to=$(OUTPUT)/diff.pvl > /dev/null; - - #cleanup - $(RM) $(OUTPUT)/$(VIR) > /dev/null; - $(RM) $(OUTPUT)/$(FC) > /dev/null; - $(RM) $(OUTPUT)/dawn.pvl > /dev/null; - $(RM) $(OUTPUT)/dawn2.pvl > /dev/null; - $(RM) $(OUTPUT)/ck_vir.bc > /dev/null; - $(RM) $(OUTPUT)/ck_fc.bc > /dev/null; - $(RM) $(OUTPUT)/spk_vir.bsp > /dev/null; - $(RM) $(OUTPUT)/spk_fc.bsp > /dev/null; - diff --git a/isis/src/lro/tsts/lroc/Makefile b/isis/src/lro/tsts/lroc/Makefile deleted file mode 100644 index ec480d513152647bd13b17627ec3ea9bdea14bdb..0000000000000000000000000000000000000000 --- a/isis/src/lro/tsts/lroc/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -IMPORT = lrowac2isis -SPICEINIT = spiceinit -CROP = crop -PROJECT = cam2map -MOSAIC = automos -INPUTFILE = wac0000a1c4 - -# These cubes, if there is a problem, will be -# very significantly different -$(INPUTFILE).uv.lev2.cub.TOLERANCE = 0.0002 -$(INPUTFILE).vis.lev2.cub.TOLERANCE = 0.0004 - -include $(ISISROOT)/make/isismake.tsts - -commands: - $(IMPORT) $(TSTARGS) from=$(INPUT)/$(INPUTFILE).img \ - to=$(OUTPUT)/$(INPUTFILE).cub \ - > /dev/null; - $(SPICEINIT) $(TSTARGS) shape=ellipsoid from=$(OUTPUT)/$(INPUTFILE).vis.even.cub > /dev/null; - $(SPICEINIT) $(TSTARGS) shape=ellipsoid from=$(OUTPUT)/$(INPUTFILE).vis.odd.cub > /dev/null; - $(SPICEINIT) $(TSTARGS) shape=ellipsoid from=$(OUTPUT)/$(INPUTFILE).uv.even.cub > /dev/null; - $(SPICEINIT) $(TSTARGS) shape=ellipsoid from=$(OUTPUT)/$(INPUTFILE).uv.odd.cub > /dev/null; - catlab $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).vis.even.cub > $(OUTPUT)/vislabel.pvl; - catlab $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).uv.odd.cub > $(OUTPUT)/uvlabel.pvl; - $(CROP) $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).vis.even.cub line=3000 nlines=200 \ - sample=100 nsamples=200 \ - TO=$(OUTPUT)/$(INPUTFILE).vis.even.crop.cub > /dev/null; - $(MV) $(OUTPUT)/$(INPUTFILE).vis.even.crop.cub \ - $(OUTPUT)/$(INPUTFILE).vis.even.cub; - $(CROP) $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).vis.odd.cub line=3000 nlines=200 \ - sample=100 nsamples=200 \ - TO=$(OUTPUT)/$(INPUTFILE).vis.odd.crop.cub > /dev/null; - $(MV) $(OUTPUT)/$(INPUTFILE).vis.odd.crop.cub \ - $(OUTPUT)/$(INPUTFILE).vis.odd.cub; - $(CROP) $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).uv.even.cub line=900 nlines=100 \ - TO=$(OUTPUT)/$(INPUTFILE).uv.even.crop.cub > /dev/null; - $(MV) $(OUTPUT)/$(INPUTFILE).uv.even.crop.cub \ - $(OUTPUT)/$(INPUTFILE).uv.even.cub; - $(CROP) $(TSTARGS) from=$(OUTPUT)/$(INPUTFILE).uv.odd.cub line=900 nlines=100 \ - TO=$(OUTPUT)/$(INPUTFILE).uv.odd.crop.cub > /dev/null; - $(MV) $(OUTPUT)/$(INPUTFILE).uv.odd.crop.cub \ - $(OUTPUT)/$(INPUTFILE).uv.odd.cub; - $(PROJECT) $(TSTARGS) FROM=$(OUTPUT)/$(INPUTFILE).vis.even.cub \ - TO=$(OUTPUT)/$(INPUTFILE).vis.even.lev2.cub DEFAULTRANGE=CAMERA \ - MINLAT=-74.026771144939 MAXLAT=-73.382294787899 \ - MINLON=242.75004784633 MAXLON=244.11987169894 \ - PIXRES=MPP RESOLUTION=52.8 \ - > /dev/null; - $(PROJECT) $(TSTARGS) FROM=$(OUTPUT)/$(INPUTFILE).vis.odd.cub \ - TO=$(OUTPUT)/$(INPUTFILE).vis.odd.lev2.cub \ - MAP=$(OUTPUT)/$(INPUTFILE).vis.even.lev2.cub MATCHMAP=TRUE \ - > /dev/null; - $(PROJECT) $(TSTARGS) FROM=$(OUTPUT)/$(INPUTFILE).uv.even.cub \ - TO=$(OUTPUT)/$(INPUTFILE).uv.even.lev2.cub DEFAULTRANGE=CAMERA \ - MINLAT=-74.672077453164 MAXLAT=-73.705457723751 \ - MINLON=242.08695858855 MAXLON=247.03644145678 \ - PIXRES=MPP RESOLUTION=266.757 \ - > /dev/null; - $(PROJECT) $(TSTARGS) FROM=$(OUTPUT)/$(INPUTFILE).uv.odd.cub \ - TO=$(OUTPUT)/$(INPUTFILE).uv.odd.lev2.cub \ - MAP=$(OUTPUT)/$(INPUTFILE).uv.even.lev2.cub MATCHMAP=TRUE \ - > /dev/null; - $(LS) $(OUTPUT)/$(INPUTFILE).vis.even.lev2.cub \ - $(OUTPUT)/$(INPUTFILE).vis.odd.lev2.cub > $(OUTPUT)/vis.lis; - $(MOSAIC) $(TSTARGS) FROMLIST=$(OUTPUT)/vis.lis \ - MOSAIC=$(OUTPUT)/$(INPUTFILE).vis.lev2.cub > /dev/null; - $(LS) $(OUTPUT)/$(INPUTFILE).uv.even.lev2.cub \ - $(OUTPUT)/$(INPUTFILE).uv.odd.lev2.cub > $(OUTPUT)/uv.lis; - $(MOSAIC) $(TSTARGS) FROMLIST=$(OUTPUT)/uv.lis \ - MOSAIC=$(OUTPUT)/$(INPUTFILE).uv.lev2.cub > /dev/null; - $(RM) $(OUTPUT)/vis.lis; - $(RM) $(OUTPUT)/uv.lis; - $(RM) $(OUTPUT)/$(INPUTFILE).vis.even.lev2.cub; - $(RM) $(OUTPUT)/$(INPUTFILE).vis.odd.lev2.cub; - $(RM) $(OUTPUT)/$(INPUTFILE).uv.even.lev2.cub; - $(RM) $(OUTPUT)/$(INPUTFILE).uv.odd.lev2.cub; - $(RM) $(OUTPUT)/$(INPUTFILE).vis.odd.cub; - $(RM) $(OUTPUT)/$(INPUTFILE).uv.odd.cub; diff --git a/isis/src/messenger/apps/mdisedrinfo/tsts/kernelchk/Makefile b/isis/src/messenger/apps/mdisedrinfo/tsts/kernelchk/Makefile deleted file mode 100644 index 651b9b7fb7234dad6b0a96146b61d4def7f0dff9..0000000000000000000000000000000000000000 --- a/isis/src/messenger/apps/mdisedrinfo/tsts/kernelchk/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -APPNAME = mdisedrinfo - -include $(ISISROOT)/make/isismake.tsts - -commands: - $(APPNAME) from='$$ISISTESTDATA/isis/src/messenger/unitTestData/EN0089576657M.IMG' \ - keylist=$(INPUT)/mdispdskeys.lis \ - to=$(OUTPUT)/mdisedrinfo.txt \ - pvl=$(OUTPUT)/EN0089576657M.pvl > /dev/null; - $(APPNAME) from='$$ISISTESTDATA/isis/src/messenger/unitTestData/EW0031592574E.IMG' \ - to=$(OUTPUT)/mdisedrinfo.txt \ - pvl=$(OUTPUT)/EW0031592574E.pvl > /dev/null; - $(APPNAME) from='$$ISISTESTDATA/isis/src/messenger/unitTestData/EW0089570936I.IMG' \ - to=$(OUTPUT)/mdisedrinfo.txt \ - pvl=$(OUTPUT)/EW0089570936I.pvl > /dev/null; - $(APPNAME) from='$$ISISTESTDATA/isis/src/messenger/unitTestData/EW0108827588A.IMG' \ - to=$(OUTPUT)/mdisedrinfo.txt \ - pvl=$(OUTPUT)/EW0108827588A.pvl > /dev/null; - $(APPNAME) from='$$ISISTESTDATA/isis/src/messenger/unitTestData/EN0108828426M.IMG' \ - to=$(OUTPUT)/mdisedrinfo.txt \ - pvl=$(OUTPUT)/EN0108828426M.pvl > /dev/null; diff --git a/isis/src/osirisrex/tsts/mapcam/Makefile b/isis/src/osirisrex/tsts/mapcam/Makefile deleted file mode 100644 index 7524e6e302b2035a397f2393a90117f87db260f2..0000000000000000000000000000000000000000 --- a/isis/src/osirisrex/tsts/mapcam/Makefile +++ /dev/null @@ -1,175 +0,0 @@ -# Category test for OSIRIS-REx mapping cameras. -# The programs chosen for this test were copied from the OSIRIS-REx team's "testIsis" program. -# The points chosen for campt were altered since this is a limb image. -# -# NOTE: This test should be updated when we acquire two overlapping mapcam images. -# See polycam test for full steps with 2 images. -# -# @history 2016-09-09 Jeannie Backer - Original version. -# @history 2017-08-29 Jeannie Backer - Updated to new test cube that has pre-processing -# flip applied. -# -20190303T100344S990_map_iofL2pan_V001-cam2map_equi.cub.TOLERANCE = 1e-03 - -include $(ISISROOT)/make/isismake.tsts - -commands: - # import first image - ocams2isis $(TSTARGS) \ - from=$(INPUT)/20190303T100344S990_map_iofL2pan_V001.fits \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - > /dev/null; - - # spiceinit first image - spiceinit $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - > /dev/null; - - # phocube first image - # create 7 band backplane with from the following values: - # dn, phase angle, emission angle, incidence angle, lat, lon, and pixel resolution - phocube $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-bp.cub \ - dn=t \ - phase=t \ - emission=t \ - incidence=t \ - pixelres=t \ - > /dev/null; - - # explode first image's backplane into 5 cubes - explode $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-bp.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-bp-explode \ - > /dev/null; - - # reunite exploded cubes. output should be identical to phocube bp output above - $(LS) $(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-bp-explode* \ - > $(OUTPUT)/phocubeBandList.txt; - cubeit $(TSTARGS) \ - from=$(OUTPUT)/phocubeBandList.txt \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-bp.cub \ - > /dev/null; - - # for each pixel in first image, multiply by 2 then add 1 - algebra $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-algebra.cub \ - operator=unary \ - a=2 \ - a=1 \ - > /dev/null; - - # (SKIP) get camera information for first image - # caminfo fails for this image using the testIsis code provided by team - #caminfo $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-caminfo.pvl \ - > /dev/null; - - # get camera statistics for first image - camstats $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-camstats.pvl \ - > /dev/null; - - # get DN statistics for first image - stats $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-dnstats.pvl \ - > /dev/null; - - # photrim first image - photrim $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-photrim.cub \ - minphase=100 \ - maxphase=101 \ - > /dev/null; - - # photomet first image - photomet $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-photomet_lunlam.cub \ - phtname=lunarlambert \ - L=0.5 \ - normname=albedo \ - incref=30 \ - incmat=0.0 \ - thresh=10e30 \ - albedo=1.0 \ - maxemission=80 \ - maxincidenc=85 \ - > /dev/null; - - # (SKIP) footprint first image - # footprintinit fails for this image using the testIsis code provided by team - footprintinit $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - > /dev/null; - - - # campt 4 corners and center of first image - # campt fails for some corner pixels, adjust s/l values to known intersections - campt $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001_campt_upperleft.pvl \ - SAMPLE=350 \ - LINE=1 \ - ALLOWOUTSIDE=no \ - > /dev/null; - campt $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001_campt_upperright.pvl \ - SAMPLE=1024 \ - LINE=1 \ - ALLOWOUTSIDE=no \ - > /dev/null; - campt $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001_campt_lowerright.pvl \ - SAMPLE=890 \ - LINE=615 \ - ALLOWOUTSIDE=no \ - > /dev/null; - campt $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001_campt_lowerleft.pvl \ - SAMPLE=256 \ - LINE=750 \ - ALLOWOUTSIDE=no \ - > /dev/null; - campt $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001_campt_imagecenter.pvl \ - SAMPLE=512 \ - LINE=512 \ - ALLOWOUTSIDE=no \ - > /dev/null; - - # get mapping group containing Equirectangular mosaic range values for the two images - $(LS) $(OUTPUT)/*spiceinit.cub > $(OUTPUT)/unprojectedSpiceinitCubeList.txt; - mosrange $(TSTARGS) \ - fromlist=$(OUTPUT)/unprojectedSpiceinitCubeList.txt \ - to=$(OUTPUT)/MCAM_equi.map \ - precision=6 \ - projection=Equirectangular \ - > /dev/null; - - # project the two images using the map from mosrange - cam2map $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - to=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-cam2map_equi.cub \ - map=$(OUTPUT)/MCAM_equi.map \ - pixres=map \ - > /dev/null; - - # getsn from each image - echo -e "\nOutput of getsn..." > $(OUTPUT)/MCAM_getsn.txt; - getsn $(TSTARGS) \ - from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \ - >> $(OUTPUT)/MCAM_getsn.txt; - - # change name so that pvldiff can compare - $(MV) $(OUTPUT)/MCAM_equi.map $(OUTPUT)/MCAM_equi.pvl; diff --git a/isis/src/system/apps/csspckgen/tsts/default/Makefile b/isis/src/system/apps/csspckgen/tsts/default/Makefile deleted file mode 100644 index 59ee4f0464f4e053647eca94f25f6fa4edec88b2..0000000000000000000000000000000000000000 --- a/isis/src/system/apps/csspckgen/tsts/default/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -APPNAME = csspckgen - -output.db.txt.IGNORELINES = RunTime LeapsecondKernel - -include $(ISISROOT)/make/isismake.tsts - -commands: - $(APPNAME) to=$(OUTPUT)/output.db.txt > /dev/null; - $(SED) "s#\(File = .cassini/kernels/pck/cpck\)[0-9][0-9][A-Z][a-z][a-z][0-9][0-9][0-9][0-9]\(.tpc\)#\1_DateRemovedForTest\2#" \ - $(OUTPUT)/output.db.txt > $(OUTPUT)/tmp.txt; - $(MV) $(OUTPUT)/tmp.txt $(OUTPUT)/output.db.txt; diff --git a/isis/tests/FunctionalTestsCtxcal.cpp b/isis/tests/FunctionalTestsCtxcal.cpp index 80aca499c617c6d7eb063c53ed501382f7fa14d9..38b4a4865d23de5929f4fb345511887ed4305620 100644 --- a/isis/tests/FunctionalTestsCtxcal.cpp +++ b/isis/tests/FunctionalTestsCtxcal.cpp @@ -13,7 +13,7 @@ using namespace Isis; static QString APP_XML = FileName("$ISISROOT/bin/xml/ctxcal.xml").expanded(); -TEST_F(MroCtxCube, FunctionalTestCtxcalDefault) { +TEST_F(MroCtxCube, DISABLED_FunctionalTestCtxcalDefault) { QString outCubeFileName = tempDir.path() + "/outTemp.cub"; QVector<QString> args = {"to="+outCubeFileName}; @@ -87,7 +87,7 @@ TEST_F(MroCtxCube, FunctionalTestCtxcalMonthlyFlatfile) { } -TEST_F(MroCtxCube, FunctionalTestCtxcalIofFalse) { +TEST_F(MroCtxCube, DISABLED_FunctionalTestCtxcalIofFalse) { QString outCubeFileName = tempDir.path() + "/outTemp.cub"; QVector<QString> args = {"to="+outCubeFileName, "iof=false"}; diff --git a/isis/tests/FunctionalTestsNoproj.cpp b/isis/tests/FunctionalTestsNoproj.cpp index 02db595a8c14b05e47fdecfb167e1ff69d5e6c9f..ad79fb98e66581fc992163c553abdbb9d3d9b5e1 100644 --- a/isis/tests/FunctionalTestsNoproj.cpp +++ b/isis/tests/FunctionalTestsNoproj.cpp @@ -52,7 +52,7 @@ TEST_F(DefaultCube, FunctionalTestNoprojDefault) { EXPECT_NEAR(hist->StandardDeviation(), 68.405508539707895, .0001); } -TEST_F(DefaultCube, FunctionalTestNoprojExpand) { +TEST_F(DefaultCube, DISABLED_FunctionalTestNoprojExpand) { QString cubeFileName = tempDir.path() + "/output.cub"; QVector<QString> args = {"to=" + cubeFileName, "sampexp=10", "lineexp=5"}; UserInterface options(APP_XML, args);