Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed SRC camera and serial number to use start time instead of sta… #4910

Merged
merged 7 commits into from
May 13, 2022
+15 −13
Merged

Changed SRC camera and serial number to use start time instead of sta… #4910

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12152d6
Changed SRC camera and serial number to use start time instead of sta…
scsides Apr 16, 2022
dff2ab4
Change log entry
scsides Apr 16, 2022
49a94c1
Tick the camera version to 2
scsides May 9, 2022
e62f134
Merge branch 'dev' into hrscsrc
scsides May 9, 2022
850100e
Update unittest
scsides May 10, 2022
c380141
Update MexHrscSrcCamera.cpp
scsides May 10, 2022
e08b30b
Update CHANGELOG.md
scsides May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
scsides marked this conversation as resolved.
Show resolved Hide resolved

### Changed

Expand Down
2 changes: 1 addition & 1 deletion isis/appdata/serialnumbers/MexSrcSerialNumber.trn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ End_Group

Group = Keyword2
Auto
InputKey = SpacecraftClockStartCount
InputKey = StartTime
InputGroup = "IsisCube,Instrument"
InputPosition = (IsisCube, Instrument)
OutputName = Keyword2
Expand Down
19 changes: 14 additions & 5 deletions isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<iTime, iTime> 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;
scsides marked this conversation as resolved.
Show resolved Hide resolved
//pair<iTime, iTime> startStop = ShutterOpenCloseTimes(startTime, exposureDuration);
//setTime(et);
scsides marked this conversation as resolved.
Show resolved Hide resolved

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.
*
Expand All @@ -104,6 +112,7 @@ namespace Isis {
}
}


/**
* This is the function that is called in order to instantiate a MexHrscSrcCamera
* object.
Expand Down