Loading isis/src/apollo/apps/apollopaninit/apollopaninit.cpp +3 −13 Original line number Diff line number Diff line Loading @@ -116,7 +116,6 @@ void IsisMain() { ProcessImport jp; FileName transFile("$apollo15/translations/apollopantranstable.trn"); PvlTranslationTable transTable(transFile); PvlGroup kernels_pvlG; //scFrameCode and insCode from user input Loading @@ -141,7 +140,6 @@ void IsisMain() { ////////////////////////////////////////////build the cube header instrament group PvlGroup inst_pvlG("Instrument"); PvlKeyword keyword; //four that are the same for every panaramic mission Loading @@ -149,17 +147,9 @@ void IsisMain() { keyword.setValue(mission); inst_pvlG.addKeyword(keyword); // keyword.setName("InstrumentName"); // keyword.setValue(transTable.Translate("InstrumentName","whatever")); // inst_pvlG.addKeyword(keyword); Pvl fakeInputLabel; // <-- there's nothing in here for this small test case, but I'm not sure that's what you want for the real thing Pvl testOutputLabel; PvlToPvlTranslationManager translater(fakeInputLabel, transFile.expanded()); translater.Auto(testOutputLabel); // then actually write testOutputLabel to the cube std::cout << testOutputLabel << std::endl; keyword.setName("InstrumentName"); keyword.setValue(transTable.Translate("InstrumentName","whatever")); inst_pvlG.addKeyword(keyword); keyword.setName("InstrumentId"); keyword.setValue(transTable.Translate("InstrumentId","whatever")); Loading isis/src/base/objs/SpiceRotation/SpiceRotation.cpp +184 −197 Original line number Diff line number Diff line Loading @@ -885,21 +885,12 @@ namespace Isis { // Now check for nutation/precession terms. Check for nut/prec ra values // first to see if the terms are even used for this body. std::cout << "centerbodycode: " << centerBodyCode << std::endl; naifKeyword = "BODY" + toString(centerBodyCode) + "_NUT_PREC_RA" ; dtpool_c(naifKeyword.toLatin1().data(), &found, &numReturned, &naifType); if (found) { // Get the barycenter (bc) linear coefficients first (2 for each period). // Then we can get the maximum expected coefficients. SpiceInt bcCode; if (!(centerBodyCode > 1000000.0)) { bcCode = centerBodyCode / 100; // Ex: bc code for Jupiter (599) & its moons is 5 } else { bcCode = centerBodyCode; } SpiceInt bcCode = centerBodyCode/100; // Ex: bc code for Jupiter (599) & its moons is 5 naifKeyword = "BODY" + toString(bcCode) + "_NUT_PREC_ANGLES" ; dtpool_c(naifKeyword.toLatin1().data(), &found, &numExpected, &naifType); std::vector<double>npAngles(numExpected, 0.); Loading Loading @@ -2389,7 +2380,6 @@ namespace Isis { kdata_c(0, "ck", FILESIZ, TYPESIZ, SOURCESIZ, file, filtyp, source, &handle, &found); dafbfs_c(handle); daffna_c(&found); int spCode = ((int)(p_constantFrames[0] / 1000)) * 1000; while (found) { Loading Loading @@ -3022,10 +3012,7 @@ namespace Isis { frinfo_c(frameCode, ¢erBodyCode, &frameClass, &classId, &found); if (found) { if (frameClass == 2 || (centerBodyCode > 0 && frameClass != 3 ) { if (frameClass == 2 || (centerBodyCode > 0 && frameClass != 3)) { m_frameType = PCK; // Load the PC information while it is available and set member values loadPCFromSpice(centerBodyCode); Loading isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp +0 −2 Original line number Diff line number Diff line Loading @@ -82,7 +82,6 @@ namespace Isis { frameId = "ROS_VIRTIS-M_IR"; } std::cout << "virFrame: " << virFrame << std::endl; instrumentRotation()->SetFrame(virFrame); // We do not want to downsize the cache Loading Loading @@ -327,7 +326,6 @@ namespace Isis { // Store line, smInfo.m_lineNum = lineno; std::cout << "line midtime: " << iTime(lineMidTime).UTC() << std::endl; smInfo.m_scanLineEt = lineMidTime; smInfo.m_mirrorSin = mirrorSin; smInfo.m_mirrorCos = mirrorCos; Loading isis/src/tgo/apps/tgocassismos/tsts/default/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -5,6 +5,6 @@ include $(ISISROOT)/make/isismake.tsts commands: $(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/mosaic.lis; $(APPNAME) fromlist=$(OUTPUT)/mosaic.lis \ to=$(OUTPUT)/tgocassismos.cub ; catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl; to=$(OUTPUT)/tgocassismos.cub >& /dev/null; catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl >& /dev/null; $(RM) $(OUTPUT)/mosaic.lis; Loading
isis/src/apollo/apps/apollopaninit/apollopaninit.cpp +3 −13 Original line number Diff line number Diff line Loading @@ -116,7 +116,6 @@ void IsisMain() { ProcessImport jp; FileName transFile("$apollo15/translations/apollopantranstable.trn"); PvlTranslationTable transTable(transFile); PvlGroup kernels_pvlG; //scFrameCode and insCode from user input Loading @@ -141,7 +140,6 @@ void IsisMain() { ////////////////////////////////////////////build the cube header instrament group PvlGroup inst_pvlG("Instrument"); PvlKeyword keyword; //four that are the same for every panaramic mission Loading @@ -149,17 +147,9 @@ void IsisMain() { keyword.setValue(mission); inst_pvlG.addKeyword(keyword); // keyword.setName("InstrumentName"); // keyword.setValue(transTable.Translate("InstrumentName","whatever")); // inst_pvlG.addKeyword(keyword); Pvl fakeInputLabel; // <-- there's nothing in here for this small test case, but I'm not sure that's what you want for the real thing Pvl testOutputLabel; PvlToPvlTranslationManager translater(fakeInputLabel, transFile.expanded()); translater.Auto(testOutputLabel); // then actually write testOutputLabel to the cube std::cout << testOutputLabel << std::endl; keyword.setName("InstrumentName"); keyword.setValue(transTable.Translate("InstrumentName","whatever")); inst_pvlG.addKeyword(keyword); keyword.setName("InstrumentId"); keyword.setValue(transTable.Translate("InstrumentId","whatever")); Loading
isis/src/base/objs/SpiceRotation/SpiceRotation.cpp +184 −197 Original line number Diff line number Diff line Loading @@ -885,21 +885,12 @@ namespace Isis { // Now check for nutation/precession terms. Check for nut/prec ra values // first to see if the terms are even used for this body. std::cout << "centerbodycode: " << centerBodyCode << std::endl; naifKeyword = "BODY" + toString(centerBodyCode) + "_NUT_PREC_RA" ; dtpool_c(naifKeyword.toLatin1().data(), &found, &numReturned, &naifType); if (found) { // Get the barycenter (bc) linear coefficients first (2 for each period). // Then we can get the maximum expected coefficients. SpiceInt bcCode; if (!(centerBodyCode > 1000000.0)) { bcCode = centerBodyCode / 100; // Ex: bc code for Jupiter (599) & its moons is 5 } else { bcCode = centerBodyCode; } SpiceInt bcCode = centerBodyCode/100; // Ex: bc code for Jupiter (599) & its moons is 5 naifKeyword = "BODY" + toString(bcCode) + "_NUT_PREC_ANGLES" ; dtpool_c(naifKeyword.toLatin1().data(), &found, &numExpected, &naifType); std::vector<double>npAngles(numExpected, 0.); Loading Loading @@ -2389,7 +2380,6 @@ namespace Isis { kdata_c(0, "ck", FILESIZ, TYPESIZ, SOURCESIZ, file, filtyp, source, &handle, &found); dafbfs_c(handle); daffna_c(&found); int spCode = ((int)(p_constantFrames[0] / 1000)) * 1000; while (found) { Loading Loading @@ -3022,10 +3012,7 @@ namespace Isis { frinfo_c(frameCode, ¢erBodyCode, &frameClass, &classId, &found); if (found) { if (frameClass == 2 || (centerBodyCode > 0 && frameClass != 3 ) { if (frameClass == 2 || (centerBodyCode > 0 && frameClass != 3)) { m_frameType = PCK; // Load the PC information while it is available and set member values loadPCFromSpice(centerBodyCode); Loading
isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp +0 −2 Original line number Diff line number Diff line Loading @@ -82,7 +82,6 @@ namespace Isis { frameId = "ROS_VIRTIS-M_IR"; } std::cout << "virFrame: " << virFrame << std::endl; instrumentRotation()->SetFrame(virFrame); // We do not want to downsize the cache Loading Loading @@ -327,7 +326,6 @@ namespace Isis { // Store line, smInfo.m_lineNum = lineno; std::cout << "line midtime: " << iTime(lineMidTime).UTC() << std::endl; smInfo.m_scanLineEt = lineMidTime; smInfo.m_mirrorSin = mirrorSin; smInfo.m_mirrorCos = mirrorCos; Loading
isis/src/tgo/apps/tgocassismos/tsts/default/Makefile +2 −2 Original line number Diff line number Diff line Loading @@ -5,6 +5,6 @@ include $(ISISROOT)/make/isismake.tsts commands: $(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/mosaic.lis; $(APPNAME) fromlist=$(OUTPUT)/mosaic.lis \ to=$(OUTPUT)/tgocassismos.cub ; catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl; to=$(OUTPUT)/tgocassismos.cub >& /dev/null; catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl >& /dev/null; $(RM) $(OUTPUT)/mosaic.lis;