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.

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

Adding Support for OSIRIS-REx TagCams Instruments #5427

Merged
merged 37 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
48e4de1
Add new IrregularBodyCameraGroundMap class
KrisBecker Jul 26, 2018
41e4141
Update documentation and app/unit tests
KrisBecker Sep 19, 2018
cc1ebcc
Merge branch 'ocams_support' of http://orgit:7990/scm/isis/enhancemen…
KrisBecker Dec 2, 2018
a93659d
Initial version of tagcams2isis
KrisBecker Jan 11, 2019
8e0c8c2
Initial version of OREX TAGCAMS Camera Model
KrisBecker Jan 23, 2019
e7c0400
Improved import of TAGCAMS image data
KrisBecker Jan 23, 2019
fd27ef1
Add complete version of OpenCV distortion model
KrisBecker Jan 23, 2019
b6c96f1
Modified OpenCV distortion model
KrisBecker Jan 23, 2019
161070d
Update TAGCAMS OpenCV distortion model parameters
KrisBecker Jan 24, 2019
67a2225
Removed unused variables to suppress warnings
KrisBecker Jan 24, 2019
39398a9
Typo in iTime.h include
KrisBecker Jan 24, 2019
1e0dacb
Removed apostrophe that causes problems on Linux
KrisBecker Jan 24, 2019
f84d6f9
Update tagcams2isis temperature computation
KrisBecker Jan 28, 2019
0fbbbb8
Update TAGCAMS camera model
KrisBecker Jan 28, 2019
dc67506
New version of TAGCAMS camera model parameters
KrisBecker Jan 28, 2019
7869994
Updates to TAGCAMS IAK
KrisBecker Feb 4, 2019
2ff7fe0
Added LT and target/observer swap parameters
KrisBecker Feb 4, 2019
de20570
Properly initialize distorted/undistorted parms
KrisBecker Feb 4, 2019
db79996
tagams2isis.xml fix already happened
KrisBecker Jan 24, 2019
791c59b
Fixed merge issue
KrisBecker Mar 7, 2019
97bdc17
Correct typo
KrisBecker Mar 29, 2019
d867bb4
Minor documentation change
KrisBecker Feb 10, 2020
79ae1bb
Merge UofA branch 'main' into USGS ISIS repo for 1) isis/src/osirisre…
kledmundson Feb 6, 2024
91e111e
Merge branch 'dev' of https://github.com/kledmundson/ISIS3 into dev
kledmundson Feb 19, 2024
233c2c6
Modified for easy development of derived classes
KrisBecker Jul 26, 2018
f6074cb
Added translations for OSIRIS-REx TagCams instruments NFTCam, NAVCam,…
kledmundson Feb 28, 2024
2626786
Committing test data for OsirisREx TagCams support. Addresses #5424.
kledmundson Mar 10, 2024
5e7751c
Initial commit of Osiris-REx Tagcams ingestion program tagcams2isis a…
kledmundson Mar 10, 2024
f5dd8c0
Adding support for intersections with irregular bodies, in particular…
kledmundson Mar 10, 2024
ec8ef50
Unit test and truth data for OsirisREx tagcams instruments. Addresses…
kledmundson Mar 10, 2024
9ec9fa0
Support for OsirisREx tagcams instruments. Addresses #5424.
kledmundson Mar 10, 2024
26f13c9
CHANGELOG entry for Osiris-REx tagcams instrument support. Addresses …
kledmundson Mar 10, 2024
acac69f
Merge branch 'DOI-USGS:dev' into enhancement/orexTagcamsSupport
kledmundson Mar 15, 2024
80fd22f
Merge branch 'DOI-USGS:dev' into enhancement/orexTagcamsSupport
kledmundson Mar 19, 2024
39a4ca0
Per review comments 2024-03-18: 1) fixed typo in IrregularBodyGroundM…
kledmundson Mar 19, 2024
ea82895
Per Adam's suggestion 2024-03-19, modified second tagcams2isis method…
kledmundson Mar 19, 2024
7d8e904
Merge branch 'dev' into enhancement/orexTagcamsSupport
Kelvinrr Apr 4, 2024
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
Prev Previous commit
Next Next commit
Removed unused variables to suppress warnings
Signed-off-by: Kris J. Becker <[email protected]>
  • Loading branch information
KrisBecker committed Mar 7, 2019
commit 67a2225453d6c15678225d2d1b2e1341f7668122
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ namespace Isis {
dmap->SetDistortion(frameCode);
}
else {
CameraDistortionMap *dMap = new CameraDistortionMap(this);
new CameraDistortionMap(this);
}

// Setup the ground and sky map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ namespace Isis {
*
* @internal
* @history 2018-03-09 Kris Becker UA Original Version
* @history 2019-01-24 Kris Becker - Removed unused variables to suppress
* warnings
*
*/
class OsirisRexTagcamsCamera : public FramingCamera {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,6 @@ namespace Isis {
double *xpp,
double *ypp) const {

// For normalizing the focal plane coordinates
double pixel_pitch = p_camera->PixelPitch();
double focal_length = p_camera->FocalLength();

// Get the current undistorted pixel coordinate
m_focalMap->SetFocalPlane(ux, uy);
*u = m_focalMap->DetectorSample();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ namespace Isis {
*
* @author 2019-01-08 Kris Becker
*
* @internal
* @internal
* @history 2019-01-24 Kris Becker - Removed unused variables to suppress
* warnings
*/
class OsirisRexTagcamsDistortionMap : public CameraDistortionMap {
public:
Expand Down