Loading isis/src/base/objs/SpiceRotation/SpiceRotation.cpp +1 −3 Original line number Original line Diff line number Diff line Loading @@ -2312,8 +2312,6 @@ namespace Isis { // final step -- downsize loaded cache and reload // final step -- downsize loaded cache and reload if (p_fullCacheSize != (int) p_cache.size()) { if (p_fullCacheSize != (int) p_cache.size()) { std::cout << "fullcachesize: " << p_fullCacheSize << std::endl; std::cout << "p_cache.size(): " << p_cache.size() << std::endl; QString msg = QString msg = "Full cache size does NOT match cache size in LoadTimeCache -- should never happen"; "Full cache size does NOT match cache size in LoadTimeCache -- should never happen"; Loading isis/src/rosetta/apps/rosvirtis2isis/rosvirtis2isis.cpp +0 −9 Original line number Original line Diff line number Diff line Loading @@ -406,17 +406,10 @@ void IsisMain () SpiceDouble etStart; SpiceDouble etStart; SpiceDouble etEnd; SpiceDouble etEnd; std::cout << "startScet: " << startScet << std::endl; std::cout << "stopScet: " << stopScet << std::endl; scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart); scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart); scs2e_c( (SpiceInt) -226, stopScet.toLatin1().data(), &etEnd); scs2e_c( (SpiceInt) -226, stopScet.toLatin1().data(), &etEnd); QString startTime = iTime(etStart-16.0).UTC(); QString startTime = iTime(etStart-16.0).UTC(); QString stopTime = iTime(etEnd-16.0).UTC(); QString stopTime = iTime(etEnd-16.0).UTC(); std::cout << "starTime: " << startTime << std::endl; std::cout << "stopTime: " << stopTime << std::endl; std::cout << std::setprecision(15) << "start et: " << etStart << std::endl; std::cout << std::setprecision(15) << "stop et: " << etEnd << std::endl; std::cout << std::setprecision(15) << "difference: " << etEnd - etStart << std::endl; SpiceChar startSclkString[50]; SpiceChar startSclkString[50]; SpiceChar endSclkString[50]; SpiceChar endSclkString[50]; Loading @@ -426,10 +419,8 @@ void IsisMain () inst.findKeyword("StartTime").setValue(startTime); inst.findKeyword("StartTime").setValue(startTime); inst.findKeyword("StopTime").setValue(stopTime); inst.findKeyword("StopTime").setValue(stopTime); std::cout << "Do we match: " << startScet << ", " << stopScet << std::endl; inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); std::cout << "Do we match: " << startSclkString << ", " << endSclkString << std::endl; outcube->putGroup(inst); outcube->putGroup(inst); Loading isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp +3 −21 Original line number Original line Diff line number Diff line Loading @@ -300,33 +300,15 @@ namespace Isis { for (int i = 0; i < hktable.Records(); i++) { for (int i = 0; i < hktable.Records(); i++) { TableRecord &trec = hktable[i]; TableRecord &trec = hktable[i]; QString scetString = trec["dataSCET"]; QString scetString = trec["dataSCET"]; // double lineMidTime = getClockTime(scetString, naifSpkCode()).Et(); double exposureDuration = exposureTime(); //16.0; // 16.099999999999998 lineEndTime = getClockTime(scetString, naifSpkCode()).Et(); lineEndTime = getClockTime(scetString, naifSpkCode()).Et(); // std::cout << lineno << ", " << iTime(lineEndTime-exposureDuration).UTC() << ", " << // iTime(lineEndTime).UTC() << std::endl; // std::cout << "UTC: " << getClockTime(scetString, naifSpkCode()).UTC() << std::endl; m_lineRates.push_back(LineRateChange(lineno, m_lineRates.push_back(LineRateChange(lineno, lineEndTime-exposureDuration, lineEndTime-exposureTime(), //lineStartTime(lineMidTime), exposureTime())); exposureTime())); cacheTime.push_back(lineEndTime-exposureTime()); cacheTime.push_back(lineEndTime-exposureTime()); lineno++; lineno++; } } cacheTime.push_back(lineEndTime); cacheTime.push_back(lineEndTime); // std::cout << "failing #: " << iTime(528395445.01256).UTC() << std::endl; // 2016-SEP-29 04:29:20.638 2016-SEP-29 04:29:36.738 Y /// 2016-09-29T0 4:29:20.580302, 2016-09-29T04:29:36.580302 //2016-09-29T04:21:20.5558536, 2016-09-29T04:21:36.5558536 // 2016-SEP-29 04:21:20.614 2016-SEP-29 04:21:36.714 Y // 2016-SEP-29 04:29:40.623 2016-SEP-29 04:29:56.723 Y //failing #: 2016-09-29T04:29:36.9302085 // Adjust the last time // Adjust the last time LineRateChange lastR = m_lineRates.back(); LineRateChange lastR = m_lineRates.back(); Loading Loading
isis/src/base/objs/SpiceRotation/SpiceRotation.cpp +1 −3 Original line number Original line Diff line number Diff line Loading @@ -2312,8 +2312,6 @@ namespace Isis { // final step -- downsize loaded cache and reload // final step -- downsize loaded cache and reload if (p_fullCacheSize != (int) p_cache.size()) { if (p_fullCacheSize != (int) p_cache.size()) { std::cout << "fullcachesize: " << p_fullCacheSize << std::endl; std::cout << "p_cache.size(): " << p_cache.size() << std::endl; QString msg = QString msg = "Full cache size does NOT match cache size in LoadTimeCache -- should never happen"; "Full cache size does NOT match cache size in LoadTimeCache -- should never happen"; Loading
isis/src/rosetta/apps/rosvirtis2isis/rosvirtis2isis.cpp +0 −9 Original line number Original line Diff line number Diff line Loading @@ -406,17 +406,10 @@ void IsisMain () SpiceDouble etStart; SpiceDouble etStart; SpiceDouble etEnd; SpiceDouble etEnd; std::cout << "startScet: " << startScet << std::endl; std::cout << "stopScet: " << stopScet << std::endl; scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart); scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart); scs2e_c( (SpiceInt) -226, stopScet.toLatin1().data(), &etEnd); scs2e_c( (SpiceInt) -226, stopScet.toLatin1().data(), &etEnd); QString startTime = iTime(etStart-16.0).UTC(); QString startTime = iTime(etStart-16.0).UTC(); QString stopTime = iTime(etEnd-16.0).UTC(); QString stopTime = iTime(etEnd-16.0).UTC(); std::cout << "starTime: " << startTime << std::endl; std::cout << "stopTime: " << stopTime << std::endl; std::cout << std::setprecision(15) << "start et: " << etStart << std::endl; std::cout << std::setprecision(15) << "stop et: " << etEnd << std::endl; std::cout << std::setprecision(15) << "difference: " << etEnd - etStart << std::endl; SpiceChar startSclkString[50]; SpiceChar startSclkString[50]; SpiceChar endSclkString[50]; SpiceChar endSclkString[50]; Loading @@ -426,10 +419,8 @@ void IsisMain () inst.findKeyword("StartTime").setValue(startTime); inst.findKeyword("StartTime").setValue(startTime); inst.findKeyword("StopTime").setValue(stopTime); inst.findKeyword("StopTime").setValue(stopTime); std::cout << "Do we match: " << startScet << ", " << stopScet << std::endl; inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); std::cout << "Do we match: " << startSclkString << ", " << endSclkString << std::endl; outcube->putGroup(inst); outcube->putGroup(inst); Loading
isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp +3 −21 Original line number Original line Diff line number Diff line Loading @@ -300,33 +300,15 @@ namespace Isis { for (int i = 0; i < hktable.Records(); i++) { for (int i = 0; i < hktable.Records(); i++) { TableRecord &trec = hktable[i]; TableRecord &trec = hktable[i]; QString scetString = trec["dataSCET"]; QString scetString = trec["dataSCET"]; // double lineMidTime = getClockTime(scetString, naifSpkCode()).Et(); double exposureDuration = exposureTime(); //16.0; // 16.099999999999998 lineEndTime = getClockTime(scetString, naifSpkCode()).Et(); lineEndTime = getClockTime(scetString, naifSpkCode()).Et(); // std::cout << lineno << ", " << iTime(lineEndTime-exposureDuration).UTC() << ", " << // iTime(lineEndTime).UTC() << std::endl; // std::cout << "UTC: " << getClockTime(scetString, naifSpkCode()).UTC() << std::endl; m_lineRates.push_back(LineRateChange(lineno, m_lineRates.push_back(LineRateChange(lineno, lineEndTime-exposureDuration, lineEndTime-exposureTime(), //lineStartTime(lineMidTime), exposureTime())); exposureTime())); cacheTime.push_back(lineEndTime-exposureTime()); cacheTime.push_back(lineEndTime-exposureTime()); lineno++; lineno++; } } cacheTime.push_back(lineEndTime); cacheTime.push_back(lineEndTime); // std::cout << "failing #: " << iTime(528395445.01256).UTC() << std::endl; // 2016-SEP-29 04:29:20.638 2016-SEP-29 04:29:36.738 Y /// 2016-09-29T0 4:29:20.580302, 2016-09-29T04:29:36.580302 //2016-09-29T04:21:20.5558536, 2016-09-29T04:21:36.5558536 // 2016-SEP-29 04:21:20.614 2016-SEP-29 04:21:36.714 Y // 2016-SEP-29 04:29:40.623 2016-SEP-29 04:29:56.723 Y //failing #: 2016-09-29T04:29:36.9302085 // Adjust the last time // Adjust the last time LineRateChange lastR = m_lineRates.back(); LineRateChange lastR = m_lineRates.back(); Loading