Unverified Commit caa3344c authored by dcookastro's avatar dcookastro Committed by GitHub
Browse files

Merge pull request #73 from kledmundson/BundleLidar 

Bundle lidar
parents 665fef7f eb00ae62

isis/src/control/apps/jigsaw/.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ ui_*.h 
*.pro

*.pro.user



# ignore all files created by running BundleAdjust

*bundleout*.txt

*.csv



print.prt



*/3rdParty/*
@@ -63,6 +67,8 @@ BundleObservationVector.cpp 
BundleObservationVector.h

BundleSettings.cpp

BundleSettings.h

BundleTargetBody.cpp

BundleTargetBody.h

ControlMeasure.cpp

ControlMeasure.h

ControlPoint.cpp

isis/src/lro/apps/lrolola2isis/lrolola2isis.cpp

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ void IsisMain() { 
    lidarPoint->SetAprioriSurfacePoint(SurfacePoint(lat, lon, radius));

    

    for (int j = 0; j < images.size(); j++) {

      if (images[j].startTime <= time || time <= images[j].endTime) {

//      if (images[j].startTime <= time || time <= images[j].endTime) {

      if (time >= images[j].startTime && time <= images[j].endTime) {

        Cube *cube = cubeMgr.OpenCube(images[j].name.expanded());

        

        if (cube != NULL) {