From 9ac2592e825ebc8fceae40c7b4777bcd6ff019a7 Mon Sep 17 00:00:00 2001 From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:16:11 -0700 Subject: [PATCH] hrsc2isis support for level 3 images (#5560) * Remove label check for level3 * update changelog * fix test * addressed PR feedback * fixed grammar --- CHANGELOG.md | 1 + isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp | 4 +--- isis/src/mex/apps/hrsc2isis/hrsc2isis.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1084c41a32..8c7e58bff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp index 2a1ddc986b..7f0a2b9b16 100644 --- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp +++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp @@ -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."; diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.xml b/isis/src/mex/apps/hrsc2isis/hrsc2isis.xml index 83d8227b15..33189947a1 100644 --- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.xml +++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.xml @@ -7,7 +7,7 @@

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.