Skip to content
Snippets Groups Projects
Unverified Commit 16f8c50e authored by Sarah Sutton's avatar Sarah Sutton Committed by GitHub
Browse files

Add new parameters OFFBODY and OFFBODYTRIM to cam2cam (#5704)


* Updated cam2cam to incorporate new parameters OFFBODY and OFFBODYTRIM.

* Updated examples and documentation addressing OFFBODY and OFFBODYTRIM parameters. Addresses #3602.

* Minor corrections to cam2cam documentation. Addresses #3602.

* Updated links in cam2cam documentation. Addresses #3602.

* Updated FunctionalTestsCam2cam.cpp to incorporate OFFBODY and OFFBODYTRIM parameters.

* Tests OFFBODY and OFFBODY trim. Addresses #3602.

* Added OFFBODY and OFFBODYTRIM parameters to cam2cam. Added tests and updated documentation. Addresses issue #3602.

* Changes made per feedback in PR. Moved xform from .cpp to .h.

* Moved Cam2CamMapper class from cam2cam.h to FunctionalTestsCam2cam.cpp.

---------

Co-authored-by: default avatarkledmundson <k.l.edmundson@gmail.com>
Co-authored-by: default avatarkledmundson <6842706+kledmundson@users.noreply.github.com>
parent 8e8ef4dd
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 0 deletions
......@@ -36,6 +36,7 @@ release.
## [Unreleased]
### Added
- Added OFFBODY and OFFBODYTRIM parameters to cam2cam. Added tests and updated documentation. [#3602] (https://github.com/DOI-USGS/ISIS3/issues/3602)
### Changed
......
Group = ShapeModel
RayTraceEngine = Bullet
OnError = Continue
EndGroup
End
#!/bin/sh
# Get example image acquired by OREX OCAMS during "Detailed Survey" phase\
dtype="map_iofL2b"\
fbase="20190509T180552S020"\
# Download the OSIRIS-REx image. Note wget can be installed using the command\
# "conda install wget"\
wget -P . "https://sbnarchive.psi.edu/pds4/orex/orex.ocams/data_calibrated/detailed_survey/$\{fbase\}_$\{dtype\}.fits"\
# Import into ISIS\
ocams2isis from="$\{fbase\}_$\{dtype\}.fits" to="$\{fbase\}_pck.cub"\
ocams2isis from="$\{fbase\}_$\{dtype\}.fits" to="$\{fbase\}_dtm.cub"\
spiceinit from="$\{fbase\}_pck.cub" shape=ellipsoid\
spiceinit from="$\{fbase\}_dtm.cub" shape=user model='$osirisrex/kernels/dsk/g_00880mm_alt_ptm_0000n00000_v020.bds' -pref=$ISISROOT/BulletEngineSelect.pref\
# Run cam2cam for each set\
cam2cam from="$\{fbase\}_pck.cub" match="$\{fbase\}_dtm.cub" to="$\{fbase\}_pck_to_dtm_def.cub"\
cam2cam from="$\{fbase\}_pck.cub" match="$\{fbase\}_dtm.cub" to="$\{fbase\}_pck_to_dtm_off.cub" offbody=true offbodytrim=false\
cam2cam from="$\{fbase\}_pck.cub" match="$\{fbase\}_dtm.cub" to="$\{fbase\}_pck_to_dtm_offtrim.cub" offbody=true offbodytrim=true\
cam2cam from="$\{fbase\}_dtm.cub" match="$\{fbase\}_pck.cub" to="$\{fbase\}_dtm_to_pck_def.cub"\
cam2cam from="$\{fbase\}_dtm.cub" match="$\{fbase\}_pck.cub" to="$\{fbase\}_dtm_to_pck_off.cub" offbody=true offbodytrim=false\
cam2cam from="$\{fbase\}_dtm.cub" match="$\{fbase\}_pck.cub" to="$\{fbase\}_dtm_to_pck_offtrim.cub" offbody=true offbodytrim=true\
isis/src/base/apps/cam2cam/assets/images/example1/cam2cam_example1_FROM_AS15-M-1537.jpeg

51.4 KiB

isis/src/base/apps/cam2cam/assets/images/example1/cam2cam_example1_GUI.jpeg

46.3 KiB

isis/src/base/apps/cam2cam/assets/images/example2/cam2cam_example2_TO_Default.jpeg

62.4 KiB

isis/src/base/apps/cam2cam/assets/images/example2/cam2cam_example2_TO_OffbodyNoTrim.jpeg

76.1 KiB

isis/src/base/apps/cam2cam/assets/images/example2/cam2cam_example2_TO_OffbodyTrim.jpeg

59.3 KiB

isis/src/base/apps/cam2cam/assets/images/example3/cam2cam_example3_dtm2ellipsoid.png

605 KiB

isis/src/base/apps/cam2cam/assets/images/example3/cam2cam_example3_ellipsoid2dtm.png

734 KiB

isis/src/base/apps/cam2cam/assets/thumbs/example1/cam2cam_example1_gui_thumb.jpeg

10.7 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment