Skip to content

Commit

Permalink
Msl Landed Fix (#590)
Browse files Browse the repository at this point in the history
* Changes to landed option

* Added changelog entry
  • Loading branch information
acpaquette authored Feb 29, 2024
1 parent e59d297 commit 0d4cfb6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

0 comments on commit 0d4cfb6

Please sign in to comment.