Unverified Commit edf2def0 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Allow isis to delegate nadir pointing to ale drivers (#5118) 

* Allow isis to delegate nadir pointing to ale drivers

* Updated changelog
parent 6a40c68f

CHANGELOG.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ release. 
  override the timestamp style naming convention of the output cube with their

  override the timestamp style naming convention of the output cube with their

  own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5162)

  own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5162)

- Added new parameters <b>ONERROR</b>, <b>ERRORLOG</b>, and <b>ERRORLIST</b> to <i>mosrange</i> to provide better control over error behavior and provide diagnostics when problems are encountered processing the input file list.[#3606](https://github.com/DOI-USGS/ISIS3/issues/3606)

- Added new parameters <b>ONERROR</b>, <b>ERRORLOG</b>, and <b>ERRORLIST</b> to <i>mosrange</i> to provide better control over error behavior and provide diagnostics when problems are encountered processing the input file list.[#3606](https://github.com/DOI-USGS/ISIS3/issues/3606)

- Added ability to delegate calculation of nadir pointing to ALE [#5117](https://github.com/USGS-Astrogeology/ISIS3/issues/5117)





### Deprecated

### Deprecated

isis/src/base/apps/spiceinit/spiceinit.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,6 @@ namespace Isis { 
        kernelSuccess = tryKernels(icube, p, ui, log, lk, pck, targetSpk,

        kernelSuccess = tryKernels(icube, p, ui, log, lk, pck, targetSpk,

                                   realCkKernel, fk, ik, sclk, spk, iak, dem, exk);

                                   realCkKernel, fk, ik, sclk, spk, iak, dem, exk);

      }

      }



      if (!kernelSuccess) {

      if (!kernelSuccess) {

        throw IException(IException::Unknown,

        throw IException(IException::Unknown,

                         "Unable to initialize camera model",

                         "Unable to initialize camera model",

isis/src/base/objs/Spice/Spice.cpp

+5 −8
Original line number Original line Diff line number Diff line
@@ -194,19 +194,16 @@ namespace Isis { 
    //  ephemerides. (2008-02-27 (KJB))

    //  ephemerides. (2008-02-27 (KJB))

    if (m_usingNaif) {

    if (m_usingNaif) {

      try {

      try {

        // At this time ALE does not compute pointing for the nadir option in spiceinit

        // If NADIR is turned on fail here so ISIS can create nadir pointing

        if (kernels["InstrumentPointing"][0].toUpper() == "NADIR") {

          QString msg = "Falling back to ISIS generation of nadir pointing";

          throw IException(IException::Programmer, msg, _FILEINFO_);

        }



        if (isd == NULL){

        if (isd == NULL){

          // try using ALE

          // try using ALE

          std::ostringstream kernel_pvl;

          std::ostringstream kernel_pvl;

          kernel_pvl << kernels;

          kernel_pvl << kernels;





          json props;

          json props;

          if (kernels["InstrumentPointing"][0].toUpper() == "NADIR") {

            props["nadir"] = true;

          }



          props["kernels"] = kernel_pvl.str();

          props["kernels"] = kernel_pvl.str();





          isd = ale::load(lab.fileName().toStdString(), props.dump(), "ale", false, false, true);

          isd = ale::load(lab.fileName().toStdString(), props.dump(), "ale", false, false, true);
@@ -440,7 +437,7 @@ namespace Isis { 




    //  2009-03-18  Tracie Sucharski - Removed test for old keywords, any files

    //  2009-03-18  Tracie Sucharski - Removed test for old keywords, any files

    // with the old keywords should be re-run through spiceinit.

    // with the old keywords should be re-run through spiceinit.

    if (kernels["InstrumentPointing"][0].toUpper() == "NADIR") {

    if (kernels["InstrumentPointing"][0].toUpper() == "NADIR" && !isUsingAle()) {

      if (m_instrumentRotation) {

      if (m_instrumentRotation) {

        delete m_instrumentRotation;

        delete m_instrumentRotation;

        m_instrumentRotation = NULL;

        m_instrumentRotation = NULL;