Skip to content

Commit

Permalink
Lo fix (#593)
Browse files Browse the repository at this point in the history
* Fixed abberation correction setting in lo driver

* Updated doc string

* Updated tests to reflect driver changes

* Added changelog entry
  • Loading branch information
acpaquette authored Mar 4, 2024
1 parent c9656f6 commit 6618a19
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
7 changes: 1 addition & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ release.

- Fixed landed sensors to correctly project locally [#590](https://github.com/DOI-USGS/ale/pull/590)
- Fixed Hayabusa amica center time computation to match ISIS [#592](https://github.com/DOI-USGS/ale/pull/592)
- Set Lunar Oribter abberation correction to None as it is in ISIS [#593](https://github.com/DOI-USGS/ale/pull/593)

## [0.10.0] - 2024-01-08

Expand Down Expand Up @@ -94,9 +95,3 @@ release.
- Chandrayaan1_mrffr IsisLabelNaifSpice driver, tests and test data [#519](https://github.com/DOI-USGS/ale/pull/519)
- MGS MOC Narrow Angle IsisLabelNaifSpice driver, tests, and test data [#517](https://github.com/DOI-USGS/ale/pull/517)
- Hayabusa NIRS IsisLabelNaifSpice driver, tests and test data [#532](https://github.com/DOI-USGS/ale/pull/532)
<<<<<<< HEAD



=======
>>>>>>> 2c73f7da6ab8efbe056fff9c160e4458fec2f982
18 changes: 17 additions & 1 deletion ale/drivers/lo_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,23 @@ def focal2pixel_samples(self):
@property
def focal2pixel_lines(self):
return self.naif_keywords[f"INS{self.ikid}_ITRANSL"]


@property
def light_time_correction(self):
"""
Returns the type of light time correction and abberation correction to
use in NAIF calls.
ISIS has set this to NONE for all Lunar Orbitor data
Returns
-------
: str
The light time and abberation correction string for use in NAIF calls.
See https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/abcorr.html
for the different options available.
"""
return 'NONE'

@property
def naif_keywords(self):
Expand Down
12 changes: 6 additions & 6 deletions tests/pytests/data/isds/lohighcamera_isd.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,16 +272,16 @@
],
"positions": [
[
-202.57206189209032,
-1605.7463485204432,
-747.2111184246384
-202.58035757681012,
-1605.896036328766,
-747.2850588815566
]
],
"velocities": [
[
1.7869560397439908,
0.0574339083382552,
-0.6936285545554077
1.7876792439637956,
0.057532310037451954,
-0.6938631425196607
]
],
"reference_frame": 1
Expand Down
3 changes: 3 additions & 0 deletions tests/pytests/test_lo_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ def test_focal2pixel_lines(self):
]
namfrm.assert_called_with("LO3_HIGH_RESOLUTION_CAMERA")

def test_light_time_correction(self):
self.driver.light_time_correction == "NONE"

def test_naif_keywords(self):
with patch('ale.drivers.lo_drivers.LoHighCameraIsisLabelNaifSpiceDriver.ikid', new_callable=PropertyMock) as ikid, \
patch('ale.base.data_naif.spice.bodvrd', return_value=[1737.4, 1737.4, 1737.4]) as bodvrd:
Expand Down

0 comments on commit 6618a19

Please sign in to comment.