From 793dcff50c94a9656eb7d8835f56d3373acd70fa Mon Sep 17 00:00:00 2001
From: AustinSanders <arsanders@usgs.gov>
Date: Fri, 22 Jul 2022 14:41:29 -0600
Subject: [PATCH] Updated wavelength / center for tgocassis2isis (#5009)
* Updated bandbin translation values
* Updated center and wavelength values
* Updated changelog
* Resolved merge conflicts
---
CHANGELOG.md | 3 +-
.../apps/tgocassis2isis/TgoCassisBandBin.trn | 22 +++++++++------
.../TgoCassisExportedInstrument.trn | 16 +++++------
.../TgoCassisExportedInstrument_PSA.trn | 16 +++++------
.../tgocassis2isis/TgoCassisMosaicBandBin.trn | 20 +++++++------
isis/tests/FunctionalTestsTgocassis2isis.cpp | 28 +++++++++----------
6 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 171aa66bad..d6b70cc34e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,8 +40,7 @@ release.
- 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)
-
-
+- Updated center / width values for TGO CaSSIS as requested [here](https://github.com/USGS-Astrogeology/ISIS3/issues/5006)
### 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)
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
index 59e843a1f5..fbbe75da89 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
@@ -34,6 +34,12 @@
# the elements tag under the second Axis_Array array tag because it also has a
# axis_name tag with a value of Sample.
+# history:
+# 2021-07-18 Austin Sanders - Updated center and width translations as
+# requested by mission team.
+
+
+
Group = FilterName
Auto
Optional
@@ -52,10 +58,10 @@ Group = Center
InputKey = Filter
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (677.4, PAN)
- Translation = (497.4, BLU)
- Translation = (835.4, RED)
- Translation = (940.2, NIR)
+ Translation = (678.2, PAN)
+ Translation = (494.8, BLU)
+ Translation = (836.0, RED)
+ Translation = (939.3, NIR)
End_Group
@@ -66,10 +72,10 @@ Group = Width
InputKey = Filter
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (231.5, PAN)
- Translation = (134.3, BLU)
- Translation = (98.0, RED)
- Translation = (120.6, NIR)
+ Translation = (231.9, PAN)
+ Translation = (133.6, BLU)
+ Translation = (98.5, RED)
+ Translation = (121.8, NIR)
End_Group
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
index cd1990fa9f..2616e19b92 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
@@ -133,10 +133,10 @@ Group = Center
InputKey = img:filter_name
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (675, PAN)
- Translation = (485, BLU)
- Translation = (840, RED)
- Translation = (985, NIR)
+ Translation = (678.2, PAN)
+ Translation = (494.8, BLU)
+ Translation = (836.0, RED)
+ Translation = (939.3, NIR)
End_Group
@@ -146,10 +146,10 @@ Group = Width
InputKey = img:filter_name
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (250, PAN)
- Translation = (165, BLU)
- Translation = (100, RED)
- Translation = (220, NIR)
+ Translation = (231.9, PAN)
+ Translation = (133.6, BLU)
+ Translation = (98.5, RED)
+ Translation = (121.8, NIR)
End_Group
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument_PSA.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument_PSA.trn
index 867325b5f2..c2eb601b6d 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument_PSA.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument_PSA.trn
@@ -136,10 +136,10 @@ Group = Center
InputKey = img:filter_name
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (675, PAN)
- Translation = (485, BLU)
- Translation = (840, RED)
- Translation = (985, NIR)
+ Translation = (678.2, PAN)
+ Translation = (494.8, BLU)
+ Translation = (836.0, RED)
+ Translation = (939.3, NIR)
End_Group
@@ -149,10 +149,10 @@ Group = Width
InputKey = img:filter_name
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (250, PAN)
- Translation = (165, BLU)
- Translation = (100, RED)
- Translation = (220, NIR)
+ Translation = (231.9, PAN)
+ Translation = (121.8, BLU)
+ Translation = (98.5, RED)
+ Translation = (133.6, NIR)
End_Group
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
index 7d32944840..43cf0d9f30 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
@@ -38,7 +38,9 @@
# history:
# 2018-06-13 Kristin Berry - Original Version.
# 2020-12-22 Kaitlyn Lee - Updated Center and Width translations to match
- TgoCassisBandBin.trn.
+# TgoCassisBandBin.trn.
+# 2021-07-18 Austin Sanders - Updated center and width translations as
+# requested by mission team.
Group = FilterName
Auto
@@ -56,10 +58,10 @@ Group = Center
InputKey = img:filter_name
OutputName = Center
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (677.4, PAN)
- Translation = (497.4, BLU)
- Translation = (835.4, RED)
- Translation = (940.2, NIR)
+ Translation = (678.2, PAN)
+ Translation = (494.8, BLU)
+ Translation = (836.0, RED)
+ Translation = (939.3, NIR)
End_Group
@@ -69,10 +71,10 @@ Group = Width
InputKey = img:filter_name
OutputName = Width
OutputPosition = (Object, IsisCube, Group, BandBin)
- Translation = (231.5, PAN)
- Translation = (134.3, BLU)
- Translation = (98.0, RED)
- Translation = (120.6, NIR)
+ Translation = (231.9, PAN)
+ Translation = (133.6, BLU)
+ Translation = (98.5, RED)
+ Translation = (121.8, NIR)
End_Group
diff --git a/isis/tests/FunctionalTestsTgocassis2isis.cpp b/isis/tests/FunctionalTestsTgocassis2isis.cpp
index 62f2a7f15d..dc55e85aec 100644
--- a/isis/tests/FunctionalTestsTgocassis2isis.cpp
+++ b/isis/tests/FunctionalTestsTgocassis2isis.cpp
@@ -106,8 +106,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestBlu) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "BLU");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 497.40);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 134.30);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 494.8);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 133.6);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143424");
// Kernels Group
@@ -180,8 +180,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestRed) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "RED");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 835.40);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 98);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 836.0);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 98.5);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143422");
// Kernels Group
@@ -254,8 +254,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestNir) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "NIR");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 940.20);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 120.60);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 939.3);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 121.8);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143423");
// Kernels Group
@@ -328,8 +328,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestPan) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "PAN");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 677.40);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 231.5);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 678.2);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 231.9);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143421");
// Kernels Group
@@ -433,8 +433,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestReingestedUnproj) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "RED");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 840);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 100);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 836.0);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 98.5);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143422");
// Kernels Group
@@ -490,8 +490,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestReingestedProj) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "RED");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 840);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 100);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 836.0);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 98.5);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143422");
// Kernels Group
@@ -548,8 +548,8 @@ TEST(TgoCassis2Isis, TgoCassis2IsisTestPSALabel) {
// BandBin Group
PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);
EXPECT_EQ(bandbin["FilterName"][0].toStdString(), "PAN");
- EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 675);
- EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 250);
+ EXPECT_DOUBLE_EQ(double(bandbin["Center"]), 678.2);
+ EXPECT_DOUBLE_EQ(double(bandbin["Width"]), 231.9);
EXPECT_EQ(bandbin["NaifIkCode"][0].toStdString(), "-143421");
// Kernels Group
--
GitLab