Unverified Commit 764c45bd authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

updated ORex data area in IsisPref (#4221) 



* updated ORex data area in IsisPref

* added entry in changelog

* modified osirisrex path

* tests

* added SCLK

* makefile change

* forcing predicted

* recon for polycam

* unittest fix

* removed unittest

Co-authored-by: default avatarrobotprogrammer22 <46390033+robotprogrammer22@users.noreply.github.com>
parent 790fd009

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ release. 
 - The isis3VarInit script is now just called isisVarInit and allows for more robust paths. [#3945](https://github.com/USGS-Astrogeology/ISIS3/pull/3945)

 - Isis2raw will now output straight to a 32bit file (no stretch) when stretch is set to None and bittype is set to 32bit. [#3878](https://github.com/USGS-Astrogeology/ISIS3/issues/3878)

 - Findimageoverlaps can now have calculations and writes happen at the same time or sequentially. [#4047](https://github.com/USGS-Astrogeology/ISIS3/pull/4047)

 - IsisPreferences has had the default path to Osirisrex updated to point to new kernels released by NAIF [#4060](https://github.com/USGS-Astrogeology/ISIS3/issues/4060) 



### Fixed

isis/IsisPreferences

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ Group = DataDirectory 
  Near         = $ISISDATA/near

  NewHorizons  = $ISISDATA/newhorizons

  Odyssey      = $ISISDATA/odyssey

  OsirisRex    = $ISISDATA/../datalocal/osirisrex

  OsirisRex    = $ISISDATA/osirisrex

  Rolo         = $ISISDATA/rolo

  Rosetta      = $ISISDATA/rosetta

  Smart1       = $ISISDATA/smart1

isis/TestPreferences

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ Group = DataDirectory 
  Near         = $ISISDATA/near

  NewHorizons  = $ISISDATA/newhorizons

  Odyssey      = $ISISDATA/odyssey

  OsirisRex    = $ISISDATA/../datalocal/osirisrex

  OsirisRex    = $ISISDATA/osirisrex

  Rolo         = $ISISDATA/rolo

  Rosetta      = $ISISDATA/rosetta

  Smart1       = $ISISDATA/smart1

isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.truth

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
Unit Test for OsirisRexOcamsCamera...



Testing PolyCam (backwards compatibility)...

FileName: 2019-01-13T23_36_05.000_PCAM_L2b_V001.cub

NAIF Frame ID: -64360



Kernel IDs: 

CK Frame ID = -64000

CK Reference ID = 1

SPK Target ID = -64

SPK Reference ID = 1



Spacecraft Name Long: OSIRIS-REx

Spacecraft Name Short: OSIRIS-REx

Instrument Name Long: PolyMath Camera

Instrument Name Short: PolyCam



Shutter open = 600694634.184289455

Shutter close = 600694634.284289479



For upper left corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For upper right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower left corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For known pixel position ...

Latitude OK

Longitude OK



Testing PolyCam (with PolyCamFocusPositionNaifId keyword)...

FileName: 20190113T191852S740_pol_iofL2pan_V001.cub

NAIF Frame ID: -64360



Kernel IDs: 

CK Frame ID = -64000

CK Reference ID = 1

SPK Target ID = -64

SPK Reference ID = 1



Spacecraft Name Long: OSIRIS-REx

Spacecraft Name Short: OSIRIS-REx

Instrument Name Long: PolyMath Camera

Instrument Name Short: PolyCam



Shutter open = 600679201.924284339

Shutter close = 600679201.944284320



For upper left corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For upper right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower left corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For known pixel position ...

Latitude OK

Longitude OK

============================================================================



Testing MapCam (backwards compatibility)...

FileName: D19030320000.cub

NAIF Frame ID: -64361



Kernel IDs: 

CK Frame ID = -64000

CK Reference ID = 1

SPK Target ID = -64

SPK Reference ID = 1



Spacecraft Name Long: OSIRIS-REx

Spacecraft Name Short: OSIRIS-REx

Instrument Name Long: Mapping Camera

Instrument Name Short: MapCam



Shutter open = 604879475.185411930

Shutter close = 604879475.205411911



For upper left corner ...

DeltaSample = NO INTERSECTION

DeltaLine = NO INTERSECTION



For upper right corner ...

DeltaSample = NO INTERSECTION

DeltaLine = NO INTERSECTION



For lower left corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For known pixel position ...

Latitude OK

Longitude OK



Testing MapCam (with PolyCamFocusPositionNaifId keyword)...

FileName: 20190303T100344S990_map_iofL2pan_V001.cub

NAIF Frame ID: -64361



Kernel IDs: 

CK Frame ID = -64000

CK Reference ID = 1

SPK Target ID = -64

SPK Reference ID = 1



Spacecraft Name Long: OSIRIS-REx

Spacecraft Name Short: OSIRIS-REx

Instrument Name Long: Mapping Camera

Instrument Name Short: MapCam



Shutter open = 604879494.175411940

Shutter close = 604879494.195411921



For upper left corner ...

DeltaSample = NO INTERSECTION

DeltaLine = NO INTERSECTION



For upper right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For lower left corner ...

DeltaSample = NO INTERSECTION

DeltaLine = NO INTERSECTION



For lower right corner ...

DeltaSample = 0.000000000

DeltaLine = 0.000000000



For known pixel position ...

Latitude OK

Longitude OK

============================================================================

isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
/** This is free and unencumbered software released into the public domain.



The authors of ISIS do not claim copyright on the contents of this file.

For more details about the LICENSE terms and the AUTHORS, you will

find files of those names at the top level of this repository. **/



/* SPDX-License-Identifier: CC0-1.0 */



#include <iomanip>

#include <iostream>



#include "Camera.h"

#include "CameraFactory.h"

#include "IException.h"

#include "iTime.h"

#include "OsirisRexOcamsCamera.h"

#include "Preference.h"

#include "Pvl.h"

#include "PvlGroup.h"



using namespace std;

using namespace Isis;



void testCamera(Cube &c, double sample, double line, double knownLat, double knownLon);

void testLineSamp(Camera *cam, double sample, double line);



/**

 * This is the unit test for the Osiris Rex Camera model.

 *

 * @author  2015-11-10 Stuart C. Sides

 * @internal

 *   @history 2015-11-10 Stuart C. Sides - Original version (PolyCam test).

 *   @history 2016-12-27 Jeannie Backer - Added test for MapCam. Added placeholder

 *                           for SamCam test (when we have an image we can spiceinit).

 *   @history 2017-08-29 Jeannie Backer - Added test for PolyCam and MapCam with

 *                           PolyCamFocusPositionNaifId keyword.

 *   @history 2017-09-18 Kristin Berry - Updated known latitudes and longitudes for the addition of

 *                           the distortion model. (For non-backwards compatibility MapCam cube

 *                           only, since we do not yet have a PolyCam cube with a motor position

 *                           that we have a distortion solution for.)

 *

 */



int main(void) {

  Preference::Preferences(true);



  cout << "Unit Test for OsirisRexOcamsCamera..." << endl;

  try {



    cout << "\nTesting PolyCam (backwards compatibility)..." << endl;

    Cube polyCamCube("$ISISTESTDATA/isis/src/osirisrex/unitTestData/2019-01-13T23_36_05.000_PCAM_L2b_V001.cub", "r");

    double knownLat = 13.9465663689936950;

    double knownLon = 349.0213035062322433;

    double sample = 512.0;

    double line = 512.0;

    testCamera(polyCamCube, sample, line, knownLat, knownLon);

    cout << "\nTesting PolyCam (with PolyCamFocusPositionNaifId keyword)..." << endl;

    Cube polyCamCube2("$ISISTESTDATA/isis/src/osirisrex/unitTestData/20190113T191852S740_pol_iofL2pan_V001.cub", "r");

    knownLat = -5.5191879351483450;

    knownLon = 349.6939492565607566;

    sample = 512.0;

    line = 512.0;

    testCamera(polyCamCube2, sample, line, knownLat, knownLon);

    cout << "============================================================================" << endl;



    cout << "\nTesting MapCam (backwards compatibility)..." << endl;

    Cube mapCamCube("$ISISTESTDATA/isis/src/osirisrex/unitTestData/D19030320000.cub", "r");

    knownLat = 73.9976065262802933;

    knownLon = 149.3814386120742768;

    sample = 512.0;

    line = 512.0;

    testCamera(mapCamCube, sample, line, knownLat, knownLon);

    cout << "\nTesting MapCam (with PolyCamFocusPositionNaifId keyword)..." << endl;

    Cube mapCamCube2("$ISISTESTDATA/isis/src/osirisrex/unitTestData/20190303T100344S990_map_iofL2pan_V001.cub", "r");

    knownLat = -19.2946930665326732;

    knownLon = 145.9510736765638512;

    sample = 512.0;

    line = 512.0;

    testCamera(mapCamCube2, sample, line, knownLat, knownLon);

    cout << "============================================================================" << endl;



/*

    cout << "\nTesting SamCam..." << endl;

    Cube samCamCube("$osirisrex/testData/20141111T202650_SCAM_L2_V001_SCAM.cub", "r");

    knownLat = 0.0;

    knownLon = 0.0;

    sample = 512.0;

    line = 512.0;

    testCamera(samCamCube, sample, line, knownLat, knownLon);

    cout << "============================================================================" << endl;

*/

  }

  catch (IException &e) {

    cout << "Failed unitTest." << endl;

    e.print();

  }

}



void testCamera(Cube &cube,

                double sample, double line,

                double knownLat, double knownLon) {



  OsirisRexOcamsCamera *cam = (OsirisRexOcamsCamera *) CameraFactory::Create(cube);

  cout << "FileName: " << FileName(cube.fileName()).name() << endl;

  cout << "NAIF Frame ID: " << cam->instrumentRotation()->Frame() << endl << endl;

  cout.setf(std::ios::fixed);

  cout << setprecision(9);



  // Test kernel IDs

  cout << "Kernel IDs: " << endl;

  cout << "CK Frame ID = " << cam->CkFrameId() << endl;

  cout << "CK Reference ID = " << cam->CkReferenceId() << endl;

  cout << "SPK Target ID = " << cam->SpkTargetId() << endl;

  cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;



  // Test name methods

  cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;

  cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;

  cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;

  cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;



  // Test Shutter Open/Close

  const PvlGroup &inst = cube.label()->findGroup("Instrument", Pvl::Traverse);

  double exposureDuration = ((double) inst["ExposureDuration"])/1000;

  QString stime = inst["StartTime"];

  double et; // StartTime keyword is the center exposure time

  str2et_c(stime.toLatin1().data(), &et);

  pair <iTime, iTime> shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration);

  cout << "Shutter open = " << shuttertimes.first.Et() << endl;

  cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl;



  // Test all four corners to make sure the conversions are right

  cout << "For upper left corner ..." << endl;

  testLineSamp(cam, 1.0, 1.0);



  cout << "For upper right corner ..." << endl;

  testLineSamp(cam, 1024.0, 1.0);



  cout << "For lower left corner ..." << endl;

  testLineSamp(cam, 1.0, 1024.0);



  cout << "For lower right corner ..." << endl;

  testLineSamp(cam, 1024.0, 1024.0);



  cout << "For known pixel position ..." << endl;

  if (!cam->SetImage(sample, line)) {

    throw IException(IException::Unknown, "ERROR setting image to known position.", _FILEINFO_);

  }

  if (abs(cam->UniversalLatitude() - knownLat) < 6E-14) {

    cout << "Latitude OK" << endl;

  }

  else {

    cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl;

  }

  if (abs(cam->UniversalLongitude() - knownLon) < 6E-14) {

    cout << "Longitude OK" << endl;

  }

  else {

    cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl;

  }

}





void testLineSamp(Camera *cam, double samp, double line) {

  bool success = cam->SetImage(samp, line);



  if (success) {

    success = cam->SetUniversalGround(cam->UniversalLatitude(), cam->UniversalLongitude());

  }



  if (success) {

    double deltaSamp = samp - cam->Sample();

    double deltaLine = line - cam->Line();

    if (fabs(deltaSamp) < 0.001) deltaSamp = 0.0;

    if (fabs(deltaLine) < 0.001) deltaLine = 0.0;

    cout << "DeltaSample = " << deltaSamp << endl;

    cout << "DeltaLine = " << deltaLine << endl << endl;

  }

  else {

    cout << "DeltaSample = NO INTERSECTION" << endl;

    cout << "DeltaLine = NO INTERSECTION" << endl << endl;

  }

}