Skip to content

Commit

Permalink
hrsc2isis support for level 3 images (DOI-USGS#5560)
Browse files Browse the repository at this point in the history
* Remove label check for level3

* update changelog

* fix test

* addressed PR feedback

* fixed grammar
  • Loading branch information
amystamile-usgs authored Jul 30, 2024
1 parent 21e870e commit 9ac2592
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ release.
- Fixed qmos segfault under GEOS 3.12 [#5539](https://github.com/DOI-USGS/ISIS3/issues/5539)
- Fixed CSMSerialNumber.trn typo [#5485](https://github.com/DOI-USGS/ISIS3/issues/5485)
- Fixed CSMSerialNumber.trn to be PVL compliant [#5484](https://github.com/DOI-USGS/ISIS3/issues/5484)
- Fixed hrsc2isis to support level 3 hrsc images [#5497](https://github.com/DOI-USGS/ISIS3/issues/5497)

### Added
- Added versioned default values to lrowacphomap's PHOALGO and PHOPARCUBE parameters and updated lrowacphomap to handle them properly. [#5452](https://github.com/DOI-USGS/ISIS3/pull/5452)
Expand Down
4 changes: 1 addition & 3 deletions isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ namespace Isis{
throw IException(IException::User, msg, _FILEINFO_);
}

// This program is setup to work with Mex HRSC processing level 1 and 2 only.
// Not level 3 (Mapped)
if ((int)label["PROCESSING_LEVEL_ID"] >= 3) {
if ((int)label["PROCESSING_LEVEL_ID"] >= 4) {
QString msg = "File [" + ui.GetFileName("FROM");
msg += "] has keyword [PROCESSING_LEVEL_ID = " + label["PROCESSING_LEVEL_ID"][0] + "]";
msg += " and can not be read by this program.";
Expand Down
2 changes: 1 addition & 1 deletion isis/src/mex/apps/hrsc2isis/hrsc2isis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description>
<p>
This program imports Mars Express HRSC files. This includes both the HRSC
Stereo and the SRC instruments with procesing level of "1" or "2" (not "3").
Stereo and the SRC instruments with processing level of "1", "2", or "3" (not "4").
The program populates all label keywords necessary to create the corresponding camera
models.
</p>
Expand Down

0 comments on commit 9ac2592

Please sign in to comment.