From 12152d65c179e7a56f17422f2dbd3232e344562b Mon Sep 17 00:00:00 2001 From: ssides Date: Fri, 15 Apr 2022 18:34:01 -0700 Subject: [PATCH 1/6] Changed SRC camera and serial number to use start time instead of start clock count --- .../serialnumbers/MexSrcSerialNumber.trn | 2 +- .../MexHrscSrcCamera/MexHrscSrcCamera.cpp | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/isis/appdata/serialnumbers/MexSrcSerialNumber.trn b/isis/appdata/serialnumbers/MexSrcSerialNumber.trn index 712e82c239..052c26e8fb 100644 --- a/isis/appdata/serialnumbers/MexSrcSerialNumber.trn +++ b/isis/appdata/serialnumbers/MexSrcSerialNumber.trn @@ -12,7 +12,7 @@ End_Group Group = Keyword2 Auto - InputKey = SpacecraftClockStartCount + InputKey = StartTime InputGroup = "IsisCube,Instrument" InputPosition = (IsisCube, Instrument) OutputName = Keyword2 diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp index caa66712ef..6991d158a1 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp +++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp @@ -75,18 +75,26 @@ namespace Isis { // The observation start time and clock count for SRC are based on the center of the exposure. Pvl &lab = *cube.label(); PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); - QString clockCount = inst["SpacecraftClockStartCount"]; - double et = getClockTime(clockCount).Et(); - double exposureDuration = (double)inst["ExposureDuration"] / 1000.0; - pair startStop = ShutterOpenCloseTimes(et, exposureDuration); - setTime(et); + // scs 2022-04-16 Changed to use the StartTime instead of the StartClock. + // HRSC SRC images taken in a sequence (e.g., Phobos) often have identical StartClock values, + // but different StartTime values + //QString clockCount = inst["SpacecraftClockStartCount"]; + //double et = getClockTime(clockCount).Et(); + //double exposureDuration = (double)inst["ExposureDuration"] / 1000.0; + //pair startStop = ShutterOpenCloseTimes(startTime, exposureDuration); + //setTime(et); + + iTime startTime; + startTime.setUtc((QString)inst["StartTime"]); + setTime(startTime); // Internalize all the NAIF SPICE information into memory. LoadCache(); NaifStatus::CheckErrors(); } + /** * Returns the shutter open and close times. * @@ -104,6 +112,7 @@ namespace Isis { } } + /** * This is the function that is called in order to instantiate a MexHrscSrcCamera * object. From dff2ab4ed838a1a86baafe643050bcbb1c29b5ff Mon Sep 17 00:00:00 2001 From: ssides Date: Fri, 15 Apr 2022 18:46:16 -0700 Subject: [PATCH 2/6] Change log entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9498bc6f7d..8c0639d861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ 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) +- Changed the Mars Express HRSC SRC camera and serial number to use the StartTime instead of the StartClockCount [#4803](https://github.com/USGS-Astrogeology/ISIS3/issues/4803) ### Changed From 49a94c1e0b9f9d5c44747c8d17ee8d12c6b52cc6 Mon Sep 17 00:00:00 2001 From: ssides Date: Mon, 9 May 2022 14:33:01 -0700 Subject: [PATCH 3/6] Tick the camera version to 2 --- isis/src/mex/objs/MexHrscSrcCamera/Camera.plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isis/src/mex/objs/MexHrscSrcCamera/Camera.plugin b/isis/src/mex/objs/MexHrscSrcCamera/Camera.plugin index 495ae95857..e23a8a200b 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/Camera.plugin +++ b/isis/src/mex/objs/MexHrscSrcCamera/Camera.plugin @@ -1,5 +1,5 @@ Group = MarsExpress/Src - Version = 1 + Version = 2 Library = MexHrscSrcCamera Routine = MexHrscSrcCameraPlugin EndGroup From 850100e29cf6e80837432c85b96e019d7c246490 Mon Sep 17 00:00:00 2001 From: ssides Date: Tue, 10 May 2022 11:38:03 -0700 Subject: [PATCH 4/6] Update unittest --- isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp index c2be1189a6..f2ac246c46 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp +++ b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp @@ -35,8 +35,8 @@ int main(void) { // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera, // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: " // and "Longitude off by: " values directly into these variables. - double knownLat = -9.3335948038633116; - double knownLon = 90.4734324741402531; + double knownLat = -6.1835212703283418; + double knownLon = 90.4775137054191845; Cube c("$ISISTESTDATA/isis/src/mex/unitTestData/H0010_0023_SR2.cub", "r"); Camera *cam = CameraFactory::Create(c); @@ -60,16 +60,16 @@ int main(void) { // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; - TestLineSamp(cam, 1.0, 1.0); + TestLineSamp(cam, 10.0, 10.0); cout << "For upper right corner ..." << endl; - TestLineSamp(cam, cam->Samples(), 1.0); + TestLineSamp(cam, cam->Samples()-10.0, 10.0); cout << "For lower left corner ..." << endl; - TestLineSamp(cam, 1.0, cam->Lines()); + TestLineSamp(cam, 10.0, cam->Lines()-10.0); cout << "For lower right corner ..." << endl; - TestLineSamp(cam, cam->Samples(), cam->Lines()); + TestLineSamp(cam, cam->Samples()-10.0, cam->Lines()-10.0); double samp = cam->Samples() / 2.0; double line = cam->Lines() / 2.0; From c380141e541e91915ef838350ebe6cec1ac5a308 Mon Sep 17 00:00:00 2001 From: Stuart Sides Date: Tue, 10 May 2022 15:22:34 -0700 Subject: [PATCH 5/6] Update MexHrscSrcCamera.cpp --- isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp index 6991d158a1..3ab3b3d54f 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp +++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp @@ -76,15 +76,6 @@ namespace Isis { Pvl &lab = *cube.label(); PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); - // scs 2022-04-16 Changed to use the StartTime instead of the StartClock. - // HRSC SRC images taken in a sequence (e.g., Phobos) often have identical StartClock values, - // but different StartTime values - //QString clockCount = inst["SpacecraftClockStartCount"]; - //double et = getClockTime(clockCount).Et(); - //double exposureDuration = (double)inst["ExposureDuration"] / 1000.0; - //pair startStop = ShutterOpenCloseTimes(startTime, exposureDuration); - //setTime(et); - iTime startTime; startTime.setUtc((QString)inst["StartTime"]); setTime(startTime); From e08b30b7a6628443bd8524e1b783635000bdbff8 Mon Sep 17 00:00:00 2001 From: Stuart Sides Date: Thu, 12 May 2022 08:57:36 -0700 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ad43e7e86..616c4dcce4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,6 @@ 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) -- Changed the Mars Express HRSC SRC camera and serial number to use the StartTime instead of the StartClockCount [#4803](https://github.com/USGS-Astrogeology/ISIS3/issues/4803) - 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) @@ -48,6 +47,7 @@ release. ### Fixed - 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) +- Fixed the Mars Express HRSC SRC camera and serial number to use the StartTime instead of the StartClockCount [#4803](https://github.com/USGS-Astrogeology/ISIS3/issues/4803) ## [7.0.0] - 2022-02-11