Commit e133b211 authored by Austin Sanders's avatar Austin Sanders
Browse files

Merged dev and resolved conflicts

parents dbc13a23 ad3d02c0

CHANGELOG.md

+7 −5
Original line number Diff line number Diff line
@@ -34,16 +34,18 @@ release. 
-->



## [Unreleased]

- Added check to determine if poles were a valid projection point in ImagePolygon when generating footprint for a map projected image. [#4390](https://github.com/USGS-Astrogeology/ISIS3/issues/4390)

- Updated the LRO photometry application Lronacpho, to use by default the current 2019 photometric model (LROC_Empirical). The model's coefficients are found in the PVL file that exists in the LRO data/mission/calibration directory. If the old parameter file is provided, the old algorithm(2014) will be used. This functionality is desired for calculation comparisons. Issue: [#4512](https://github.com/USGS-Astrogeology/ISIS3/issues/4512), PR: [#4519](https://github.com/USGS-Astrogeology/ISIS3/pull/4519)

- Added a new application, framestitch, for stitching even and odd push frame images back together prior to processing in other applications. [4924](https://github.com/USGS-Astrogeology/ISIS3/issues/4924)

- Added changes to lronaccal to use time-dependent dark files for dark correction and use of specific dark files for images with exp code of zero. Also added GTests for lronaccal and refactored code to make callable. Added 3 truth cubes to testing directory.  PR[#4520](https://github.com/USGS-Astrogeology/ISIS3/pull/4520)



### Changed

- Updated the LRO photometry application Lronacpho, to use by default the current 2019 photometric model (LROC_Empirical). The model's coefficients are found in the PVL file that exists in the LRO data/mission/calibration directory. If the old parameter file is provided, the old algorithm(2014) will be used. This functionality is desired for calculation comparisons. Issue: [#4512](https://github.com/USGS-Astrogeology/ISIS3/issues/4512), PR: [#4519](https://github.com/USGS-Astrogeology/ISIS3/pull/4519)

- Updated the LRO calibration application Lrowaccal to add a units label to the RadiometricType keyword of the Radiometry group in the output cube label if the RadiometricType parameter is Radiance. No functionality is changed if the RadiometricType parameter is IOF. Lrowaccal has also been refactored to be callable for testing purposes. Issue: [#4939](https://github.com/USGS-Astrogeology/ISIS3/issues/4939), PR: [#4940](https://github.com/USGS-Astrogeology/ISIS3/pull/4940)



- Changed how logs are reported so they no longer only printing at the end of the applications execution. [#4914](https://github.com/USGS-Astrogeology/ISIS3/issues/4914)

- Update marcical to include step 3 of the mission team's MARCI calibration process described [here](https://pds-imaging.jpl.nasa.gov/data/mro/mars_reconnaissance_orbiter/marci/mrom_1343/calib/marcical.txt). [#5004](https://github.com/USGS-Astrogeology/ISIS3/pull/5004)

### Added

- Improved functionality of msi2isis and MsiCamera model to support new Eros dataset, including support for Gaskell's SUMSPICE files that adjust timing, pointing and spacecraft position ephemeris. [#4886](https://github.com/USGS-Astrogeology/ISIS3/issues/4886)

- Added a new application, framestitch, for stitching even and odd push frame images back together prior to processing in other applications. [4924](https://github.com/USGS-Astrogeology/ISIS3/issues/4924)

- Re-added and refactored the LRO photometry application lrowacphomap to be callable for testing purposes. Issue: [#4960](https://github.com/USGS-Astrogeology/ISIS3/issues/4960), PR: [#4961](https://github.com/USGS-Astrogeology/ISIS3/pull/4961)

- Added check to determine if poles were a valid projection point in ImagePolygon when generating footprint for a map projected image. [#4390](https://github.com/USGS-Astrogeology/ISIS3/issues/4390)

- Added changes to lronaccal to use time-dependent dark files for dark correction and use of specific dark files for images with exp code of zero. Also added GTests for lronaccal and refactored code to make callable. Added 3 truth cubes to testing directory.  PR[#4520](https://github.com/USGS-Astrogeology/ISIS3/pull/4520)



### Deprecated

isis/src/base/apps/automos/automos.cpp

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ namespace Isis { 
        PvlGroup outsiders("Outside");

        outsiders += PvlKeyword("File", list[i].toString());

        if (log) {

          log->addGroup(outsiders);

          log->addLogGroup(outsiders);

        }

      }

      else {
@@ -95,7 +95,7 @@ namespace Isis { 
    // Logs the input file location in the mosaic

    for (int i = 0; i < m.imagePositions().groups(); i++) {

      if (log) {

        log->addGroup(m.imagePositions().group(i));

        log->addLogGroup(m.imagePositions().group(i));

      }

    }

isis/src/base/apps/automos/main.cpp

+1 −13
Original line number Diff line number Diff line
@@ -25,20 +25,8 @@ map <QString, void *> GuiHelpers() { 
void IsisMain() {

  UserInterface &ui = Application::GetUserInterface();

  Pvl appLog;

  try {

  automos(ui, &appLog);

}

  catch (...) {

    for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

      Application::Log(*grpIt);

    }

    throw;

  }



  for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

    Application::Log(*grpIt);

  }

}



// Function to calculate the ground range from multiple inputs (list of images)

void calcRange(double &minLat, double &maxLat, double &minLon, double &maxLon) {

isis/src/base/apps/cam2map/cam2map.cpp

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ namespace Isis { 


    // add mapping to print.prt

    if(log) {

      log->addGroup(cleanMapping);

      log->addLogGroup(cleanMapping);

    }



    // Cleanup

isis/src/base/apps/cam2map/main.cpp

+1 −13
Original line number Diff line number Diff line
@@ -35,20 +35,8 @@ map <QString, void *> GuiHelpers() { 
void IsisMain() {

  UserInterface &ui = Application::GetUserInterface();

  Pvl appLog;

  try {

  cam2map(ui, &appLog);

}

  catch (...) {

    for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

      Application::Log(*grpIt);

    }

    throw;

  }



  for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {

    Application::Log(*grpIt);

  }

}



// Helper function to print out mapfile to session log

void printMap() {