Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Ale
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
Ale
Commits
0d4cfb60
Unverified
Commit
0d4cfb60
authored
1 year ago
by
acpaquette
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Msl Landed Fix (#590)
* Changes to landed option * Added changelog entry
parent
e59d297b
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
ale/base/type_sensor.py
+1
-4
1 addition, 4 deletions
ale/base/type_sensor.py
ale/drivers/msl_drivers.py
+4
-1
4 additions, 1 deletion
ale/drivers/msl_drivers.py
with
9 additions
and
5 deletions
CHANGELOG.md
+
4
−
0
View file @
0d4cfb60
...
...
@@ -37,6 +37,10 @@ release.
### Added
-
Apollo Metric drivers, tests, and data
[
#533
](
https://github.com/DOI-USGS/ale/pull/533
)
### Fixed
-
Fixed landed sensors to correctly project locally
[
#590
](
https://github.com/DOI-USGS/ale/pull/590
)
## [0.10.0] - 2024-01-08
### Added
...
...
This diff is collapsed.
Click to expand it.
ale/base/type_sensor.py
+
1
−
4
View file @
0d4cfb60
...
...
@@ -500,10 +500,7 @@ class Cahvor():
v_s
=
self
.
compute_v_s
()
H_prime
=
(
self
.
cahvor_camera_dict
[
'
H
'
]
-
h_c
*
self
.
cahvor_camera_dict
[
'
A
'
])
/
h_s
V_prime
=
(
self
.
cahvor_camera_dict
[
'
V
'
]
-
v_c
*
self
.
cahvor_camera_dict
[
'
A
'
])
/
v_s
if
self
.
_props
.
get
(
"
landed
"
,
False
):
self
.
_cahvor_rotation_matrix
=
np
.
array
([
-
H_prime
,
-
V_prime
,
self
.
cahvor_camera_dict
[
'
A
'
]])
else
:
self
.
_cahvor_rotation_matrix
=
np
.
array
([
H_prime
,
V_prime
,
self
.
cahvor_camera_dict
[
'
A
'
]])
self
.
_cahvor_rotation_matrix
=
np
.
array
([
H_prime
,
V_prime
,
self
.
cahvor_camera_dict
[
'
A
'
]])
return
self
.
_cahvor_rotation_matrix
@property
...
...
This diff is collapsed.
Click to expand it.
ale/drivers/msl_drivers.py
+
4
−
1
View file @
0d4cfb60
...
...
@@ -183,8 +183,11 @@ class MslMastcamPds3NaifSpiceDriver(Cahvor, Framer, Pds3Label, NaifSpice, Cahvor
# See is_navcam() for an explanation.
return
(
self
.
compute_h_s
()
+
self
.
compute_v_s
())
/
2.0
if
self
.
_props
.
get
(
"
landed
"
,
False
):
return
-
super
().
focal_length
# For mast cam
return
super
().
focal_length
return
super
().
focal_length
@property
def
pixel_size
(
self
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment