CSM Camera Skymap #5072

acpaquette · 2022-11-10T21:57:28Z

Attempt at getting the CSM camera to work with skymap

Description

These changes are related to getting the MSL Mastcam data projected using ISIS but met a hard block once the setSky function was hit. Within ISIS this uses the camera look vector to generate a focalplaneX/Y from a line/sample but the CSM doesn't support data within the camera reference frame.

There is still room for experimentation but it seems like we will need a specific program for creating projections from rover data.

Related Issue

Ground based sensor work (See USGSCSM IAA Proposal)

How Has This Been Validated?

Has not been validated as the changes are incomplete

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Documentation change (update to the documentation; no code change)
Breaking change (fix or feature that would cause existing functionality to change)
Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

I have read and agree to abide by the Code of Conduct
I have read the CONTRIBUTING document.
My change requires a change to the documentation and I have updated the documentation accordingly.
I have added tests to cover my changes.
I have added myself to the .zenodo.json document.
I have added any user impacting changes to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

isis/src/base/apps/csminit/csminit.cpp

isis/src/base/apps/skymap/main.cpp

isis/src/base/apps/skymap/skymap.xml

isis/src/base/objs/CSMCamera/CSMCamera.cpp

isis/src/base/objs/CSMSkyMap/CSMSkyMap.cpp

AustinSanders

I think this needs a changelog entry and then we're good to go

Kelvinrr

I think we also need tests for the new CSMCamera stuff?

Kelvinrr · 2024-01-18T23:06:52Z

CHANGELOG.md

+- CSMCamera can now read and use the body rotation from ALE produced ISDs [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
+- CSMSkyMap added to CSMCamera for use with local rover projections in ISIS [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)


We don't normally allow more than one changelog but this is an old PR so we can probably let it slide.

isis/src/base/apps/csminit/csminit.cpp

acpaquette · 2024-01-22T19:59:43Z

@Kelvinrr Tests are present, I will double check add potentially add some for coverage

Kelvinrr · 2024-02-05T21:54:39Z

skymap_app_test_user seems to be failing

acpaquette · 2024-02-05T22:24:55Z

isis/src/base/apps/skymap/main.cpp

+  if (abs(p_incam->RightAscension() - lon) > 0.1) return false;
+  if (abs(p_incam->Declination() - lat) > 0.1) return false;


@Kelvinrr These lines were added to avoid dual projection, changing the values in the skymap test. Basically any look vector projects into two points in right ascension and declination, so if you project to 0, 0 you also project onto 0, 180. This checks avoids look vectors projecting into the inverse right ascension, declination

Did you update the test data? We just got to make sure we aren't adding another failing test if we dont have to.

I have updated data, we usually check it in once the PR is merged

kk just making sure

acpaquette force-pushed the clean_csmcamera_sky branch from 24ccfad to 07751f4 Compare January 30, 2023 18:20

acpaquette changed the title ~~CSM Camera Attempted Skymap (Book keeping -- avoid merge)~~ CSM Camera Skymap May 8, 2023

acpaquette marked this pull request as ready for review May 8, 2023 23:07

acpaquette mentioned this pull request May 8, 2023

Allow CSMinit to pull body rotations #5071

Closed

12 tasks

acpaquette requested review from jlaura, Kelvinrr and AustinSanders May 8, 2023 23:09

AustinSanders reviewed Sep 6, 2023

View reviewed changes

acpaquette force-pushed the clean_csmcamera_sky branch from 340e84b to 0860783 Compare September 7, 2023 21:18

acpaquette requested a review from AustinSanders October 2, 2023 22:57

AustinSanders previously approved these changes Oct 3, 2023

View reviewed changes

acpaquette dismissed AustinSanders’s stale review via 9c6b9d3 October 4, 2023 00:17

AustinSanders reviewed Oct 4, 2023

View reviewed changes

acpaquette requested a review from AustinSanders October 13, 2023 19:46

AustinSanders previously approved these changes Oct 13, 2023

View reviewed changes

acpaquette dismissed AustinSanders’s stale review via 66e7713 October 24, 2023 22:48

acpaquette force-pushed the clean_csmcamera_sky branch from f57b6ef to 66e7713 Compare October 24, 2023 22:48

acpaquette requested a review from AustinSanders October 24, 2023 22:48

AustinSanders previously approved these changes Oct 25, 2023

View reviewed changes

Kelvinrr and others added 11 commits January 1, 2024 17:50

stuff

95a309b

idk

e42982c

working skypt on csm cam

58aab7f

Initial tweeks to the CSM camera to get skymap to work with it

fb7d58c

Adds body rotation in csminit if it is present on the ISD

398f222

Adds test to extract body rotation from isd if it exists

61da0f8

Addressed feedback and did extra clean uip

58f3678

A bunch of msl related camera changes

90f5f2d

Removed left over print statements

8476a12

Updated csminit/CSMCamera pipeline to get the correct data

043eff2

Small doc fix in RaDecRange in Camera.cpp

e9652b0

acpaquette added 6 commits January 1, 2024 17:56

Fixed most test failures

8ef96d0

Fixed last failing test

1c4e60b

Clean up

7912410

Fixed changes to comments in camera.cpp

0c136b9

Added changelog entries

8be33de

Minor fixes and guards in CSMCamera

53acbd7

acpaquette dismissed AustinSanders’s stale review via 53acbd7 January 6, 2024 01:25

acpaquette force-pushed the clean_csmcamera_sky branch from 66e7713 to 53acbd7 Compare January 6, 2024 01:25

acpaquette added 2 commits January 12, 2024 17:12

Fixes in qview tools when working with sky target imagery

1b9abb3

Fixed spacing

626f7b9

acpaquette requested a review from AustinSanders January 18, 2024 22:27

Kelvinrr reviewed Jan 18, 2024

View reviewed changes

acpaquette added 3 commits January 23, 2024 13:54

Removed body rotation extraction from ISDs

834fe61

Fixed failing test

06f6821

Updated cam camera tests

bd6c50f

acpaquette force-pushed the clean_csmcamera_sky branch from 88aa47c to bd6c50f Compare January 24, 2024 21:31

acpaquette added 3 commits January 24, 2024 14:32

Merge branch 'dev' into clean_csmcamera_sky

d45ee4f

Remove body rotation tests

36a7745

Added print statement

4eb0482

acpaquette requested a review from Kelvinrr January 31, 2024 19:18

Removed print statement

8f0b2fe

Kelvinrr previously approved these changes Jan 31, 2024

View reviewed changes

Modified imageToRemoteImageLocus expected call

ab298bd

acpaquette dismissed Kelvinrr’s stale review via ab298bd February 2, 2024 21:16

acpaquette requested a review from Kelvinrr February 3, 2024 01:21

acpaquette commented Feb 5, 2024

View reviewed changes

Kelvinrr approved these changes Feb 7, 2024

View reviewed changes

acpaquette merged commit e417363 into DOI-USGS:dev Feb 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CSM Camera Skymap #5072

CSM Camera Skymap #5072

acpaquette commented Nov 10, 2022 •

edited

Loading

AustinSanders left a comment

Kelvinrr left a comment

Kelvinrr Jan 18, 2024

acpaquette commented Jan 22, 2024

Kelvinrr commented Feb 5, 2024

acpaquette Feb 5, 2024 •

edited

Loading

Kelvinrr Feb 7, 2024

acpaquette Feb 7, 2024

Kelvinrr Feb 7, 2024

		- CSMCamera can now read and use the body rotation from ALE produced ISDs [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
		- CSMSkyMap added to CSMCamera for use with local rover projections in ISIS [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)

		if (abs(p_incam->RightAscension() - lon) > 0.1) return false;
		if (abs(p_incam->Declination() - lat) > 0.1) return false;

CSM Camera Skymap #5072

CSM Camera Skymap #5072

Conversation

acpaquette commented Nov 10, 2022 • edited Loading

Description

Related Issue

How Has This Been Validated?

Types of changes

Checklist:

Licensing

AustinSanders left a comment

Choose a reason for hiding this comment

Kelvinrr left a comment

Choose a reason for hiding this comment

Kelvinrr Jan 18, 2024

Choose a reason for hiding this comment

acpaquette commented Jan 22, 2024

Kelvinrr commented Feb 5, 2024

acpaquette Feb 5, 2024 • edited Loading

Choose a reason for hiding this comment

Kelvinrr Feb 7, 2024

Choose a reason for hiding this comment

acpaquette Feb 7, 2024

Choose a reason for hiding this comment

Kelvinrr Feb 7, 2024

Choose a reason for hiding this comment

acpaquette commented Nov 10, 2022 •

edited

Loading

acpaquette Feb 5, 2024 •

edited

Loading