Commit 62500633 authored by Kristin's avatar Kristin
Browse files

Cleanup of merge of virtis changes

parent e7ea41de
Loading
Loading
Loading
Loading
+7 −11
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ namespace Isis {
      LineCache(tableName);

      //std::cout << "Full cache size is " << p_cache.size() << endl;
      
      p_minimizeCache = Yes;
      LoadTimeCache();

@@ -1931,7 +1930,6 @@ namespace Isis {
    return;
 }

  // NEW: sets the cache time
  void SpiceRotation::SetCacheTime(std::vector<double> cacheTime) {
    // Do not reset the cache times if they are already loaded. 
    if (p_cacheTime.size() <= 0) {
@@ -2491,8 +2489,6 @@ namespace Isis {
        cacheSlope = (p_fullCacheEndTime - p_fullCacheStartTime) / (double)(p_fullCacheSize - 1);
      for (int i = 0; i < p_fullCacheSize; i++)
        p_cacheTime.push_back(p_fullCacheStartTime + (double) i * cacheSlope); 
      // could try to change the kernels: type, resample, something else? check on type 2 or 3, concerned about interpolation
      // it's already type 2 or 3... 
      if (p_source == Nadir) {
        p_minimizeCache = No;
      }
+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ namespace Isis {
      enum DownsizeStatus {
        Yes,  //!< Downsize the cache
        Done, //!< Cache is downsized
        No,   //!< Do not downsize the cache
        No    //!< Do not downsize the cache
      };

      /**
+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
#include <istream>
#include <sstream>
#include <cmath>
#include <iomanip>

#include <QString>
#include <QFileInfo>
@@ -410,7 +409,7 @@ void IsisMain ()
    scs2e_c( (SpiceInt) -226, stopScet.toLatin1().data(), &etEnd);

    PvlKeyword &frameParam = inst["FrameParameter"];
    exposureTime = toDouble(frameParam[0]);
    double exposureTime = toDouble(frameParam[0]);

    QString startTime = iTime(etStart-exposureTime).UTC(); 
    QString stopTime = iTime(etEnd-exposureTime).UTC();