diff --git a/CHANGELOG.md b/CHANGELOG.md index 145b4ae7d511809bc194e70222038ec7f87b0dc7..e9a9bc4f1514a997a4b68eb389406d07f4facf28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/ale/base/type_sensor.py b/ale/base/type_sensor.py index 8229b66c0ba91060ed081b8c7ae19536def0b4bd..584bdf054bc2803ba9b77626cee9877587b0bc07 100644 --- a/ale/base/type_sensor.py +++ b/ale/base/type_sensor.py @@ -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 diff --git a/ale/drivers/msl_drivers.py b/ale/drivers/msl_drivers.py index f4ab01c8aa46d64d68fc6ec61c2ec6282568eb49..522cb8d61b8d925a3b312542a9c18e0691c4a0aa 100644 --- a/ale/drivers/msl_drivers.py +++ b/ale/drivers/msl_drivers.py @@ -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):