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

Msl Landed Fix #590

Merged
merged 2 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ release.

## [Unreleased]

### Fixed

- Fixed landed sensors to correctly project locally [#590](https://github.com/DOI-USGS/ale/pull/590)

## [0.10.0] - 2024-01-08

### Added
Expand Down
5 changes: 1 addition & 4 deletions ale/base/type_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,7 @@ def cahvor_rotation_matrix(self):
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
Expand Down
5 changes: 4 additions & 1 deletion ale/drivers/msl_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,11 @@ def focal_length(self):
# 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):
Expand Down
Loading